From patchwork Mon Dec 11 20:57:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 847226 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="cgqA409v"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ywbBj00frz9t2x for ; Tue, 12 Dec 2017 08:07:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751628AbdLKVHi (ORCPT ); Mon, 11 Dec 2017 16:07:38 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:37057 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347AbdLKVHh (ORCPT ); Mon, 11 Dec 2017 16:07:37 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBBL7DFc038841; Mon, 11 Dec 2017 21:07:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2017-10-26; bh=V6TPxjWCOWPiBzRCIbz6SF+B/iKQ36tRyt8zjKEJyYY=; b=cgqA409vir3tdIthuUaoVjUcEQLKlSBgsR66ekPBWENrI7FYmAJg0WkO3aJ6VgE+wNSa NXk41+eoOKa7eVlweEaNOnuxlhrMaz6jT1/ZuaiD118ozfG4RW9aSiU+syZ/20t5AEZs GLHVlq/zJCEZ3gazCC1JcoPnY0iJeB9R6xd3KWiopL3qUpUtGFVh2I5NjK19eM1De5tD iYObXh/MHnl51SIHSwqKHabYVapCEyaYUrwl2z0zjceb8epgj8j4IUTO4IaIZ202uPBN Zx6/9mT5d0zdkNV6LtKuJMUSt1tcaGbP6EgmZ2D2hVh03y8kQ0/AqGbn4SRVkVu6Fxnt gw== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2et1mhg0f3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Dec 2017 21:07:33 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBBKvWNt019987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 Dec 2017 20:57:32 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vBBKvWMP012856; Mon, 11 Dec 2017 20:57:32 GMT Received: from slnelson-mint18.us.oracle.com (/10.159.226.133) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 Dec 2017 12:57:32 -0800 From: Shannon Nelson To: steffen.klassert@secunet.com Cc: netdev@vger.kernel.org Subject: [PATCH ipsec-next] xfrm: check for xdo_dev_state_free Date: Mon, 11 Dec 2017 12:57:22 -0800 Message-Id: <1513025842-12064-1-git-send-email-shannon.nelson@oracle.com> X-Mailer: git-send-email 2.7.4 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8742 signatures=668644 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=3 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=790 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712110301 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current XFRM code assumes that we've implemented the xdo_dev_state_free() callback, even if it is meaningless to the driver. This patch adds a check for it before calling, as done in other APIs, and is done for the xdo_state_offload_ok() callback. Also, we add a check for the required add and delete functions up front at registration time to be sure both are defined, and complain if not. Signed-off-by: Shannon Nelson --- include/net/xfrm.h | 3 ++- net/xfrm/xfrm_device.c | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index e015e16..dfabd04 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1891,7 +1891,8 @@ static inline void xfrm_dev_state_free(struct xfrm_state *x) struct net_device *dev = xso->dev; if (dev && dev->xfrmdev_ops) { - dev->xfrmdev_ops->xdo_dev_state_free(x); + if (dev->xfrmdev_ops->xdo_dev_state_free) + dev->xfrmdev_ops->xdo_dev_state_free(x); xso->dev = NULL; dev_put(dev); } diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 30e5746..0df1cc2 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -144,11 +144,21 @@ EXPORT_SYMBOL_GPL(xfrm_dev_offload_ok); static int xfrm_dev_register(struct net_device *dev) { - if ((dev->features & NETIF_F_HW_ESP) && !dev->xfrmdev_ops) - return NOTIFY_BAD; - if ((dev->features & NETIF_F_HW_ESP_TX_CSUM) && - !(dev->features & NETIF_F_HW_ESP)) + if (!(dev->features & NETIF_F_HW_ESP)) { + if (dev->features & NETIF_F_HW_ESP_TX_CSUM) { + netdev_err(dev, "NETIF_F_HW_ESP_TX_CSUM without NETIF_F_HW_ESP\n"); + return NOTIFY_BAD; + } else { + return NOTIFY_DONE; + } + } + + if (!(dev->xfrmdev_ops && + dev->xfrmdev_ops->xdo_dev_state_add && + dev->xfrmdev_ops->xdo_dev_state_delete)) { + netdev_err(dev, "add or delete function missing from xfrmdev_ops\n"); return NOTIFY_BAD; + } return NOTIFY_DONE; }