From patchwork Thu Dec 14 21:01:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 848774 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="PGfHpeV7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyQwL5P5rz9t3F for ; Fri, 15 Dec 2017 08:01:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333AbdLNVBg (ORCPT ); Thu, 14 Dec 2017 16:01:36 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:40820 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753012AbdLNVB3 (ORCPT ); Thu, 14 Dec 2017 16:01:29 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBEKvxJm067598; Thu, 14 Dec 2017 21:01:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=zC8o/LFZvXE9FcOORCY1wJiPF1EVoBwgf2vN2FO8nvo=; b=PGfHpeV7Io8Cb1e2VnOUeVZDfXLDHqX8rW9H+n70X7sEmWb5YtjlmLeqmvdmXCP8Sf+B 6G8t8zasuAJ5O2RQ/bB79ikNxv/CzFi0ufEff2Wmo97qtWdRvyG0cRAimj0I/4fndXQ7 taFKhIUhNVgZg0yNiT1UZ+NB3lqcs+tVe5l4gdaUzYmqKtHjBoHrn7ioUd6aIDDDtY0z onzle1Cuti71zsZsFcxSHmoSmSOgSGJ810DlrIBiTAUbfto7wa1eby7fDpNsqYVkbf4w 38C2S2C1V7lEI6bvhhMFr7TRswaY2CLJBbLjeToRNv1yHztY4o1nj0kC5wc66kcLjvsr ZA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2ev0kyr4sd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:25 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBEL1Oca028974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:24 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vBEL1O0B005012; Thu, 14 Dec 2017 21:01:24 GMT Received: from slnelson-mint18.us.oracle.com (/10.159.251.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 14 Dec 2017 13:01:23 -0800 From: Shannon Nelson To: steffen.klassert@secunet.com Cc: netdev@vger.kernel.org Subject: [PATCH v2 ipsec-next 1/3] xfrm: check for xdo_dev_state_free Date: Thu, 14 Dec 2017 13:01:15 -0800 Message-Id: <1513285277-21092-2-git-send-email-shannon.nelson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> References: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8745 signatures=668648 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=3 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=509 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712140288 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, to prevent a NULL function pointer kernel crash. Signed-off-by: Shannon Nelson --- include/net/xfrm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } From patchwork Thu Dec 14 21:01:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 848772 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="lZTw8dBJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyQwG2NzCz9t3F for ; Fri, 15 Dec 2017 08:01:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbdLNVBa (ORCPT ); Thu, 14 Dec 2017 16:01:30 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:34257 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752751AbdLNVB2 (ORCPT ); Thu, 14 Dec 2017 16:01:28 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBEKvA5h093274; Thu, 14 Dec 2017 21:01:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=y0s/Dxna+PHzqTWuYtgj9XGo8Uz1xv4t4cOnxFxfh/4=; b=lZTw8dBJzBFy6+qNBeNsrCnFmlvORRavnl1c6mhzU0w6wK7/pPLD5B55LehkVxdrg0l8 BLyQeWwiLQgRbWsPFQ0XmWfRSfiXnS3pqR424FKfCJNi+bqTX9Yh4EyA9e7U/Tn6iAHw mNT2pCpgcmvzZq9mLCSoBzxpTf3OOXW0MxAEJm0XvKn3G+6hi49fVSHDNZxrSZUaIP88 4xw6qbAGCYc1Cs37A1omVj7cXmWfy0LXi76GfVpbkuFsswZuRsCOjGSykaxMu/673i7L Xq0OTOqWbTNVZ7AVry8xy9ynKroRo+6eVUOU8H1gM5GpULMVSiaSq/kqukPwiyHtoErr vA== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2ev0par2xw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:25 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id vBEL1ONl031409 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:24 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id vBEL1O8u016422; Thu, 14 Dec 2017 21:01:24 GMT Received: from slnelson-mint18.us.oracle.com (/10.159.251.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 14 Dec 2017 13:01:24 -0800 From: Shannon Nelson To: steffen.klassert@secunet.com Cc: netdev@vger.kernel.org Subject: [PATCH v2 ipsec-next 2/3] xfrm: check for xdo_dev_ops add and delete Date: Thu, 14 Dec 2017 13:01:16 -0800 Message-Id: <1513285277-21092-3-git-send-email-shannon.nelson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> References: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8745 signatures=668648 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=989 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712140288 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds a check for the required add and delete functions up front at registration time to be sure both are defined. Signed-off-by: Shannon Nelson --- net/xfrm/xfrm_device.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 30e5746..5eb6b82 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -144,11 +144,19 @@ 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) + return NOTIFY_BAD; + else + return NOTIFY_DONE; + } + +#ifdef CONFIG_XFRM_OFFLOAD + if (!(dev->xfrmdev_ops && + dev->xfrmdev_ops->xdo_dev_state_add && + dev->xfrmdev_ops->xdo_dev_state_delete)) return NOTIFY_BAD; +#endif return NOTIFY_DONE; } From patchwork Thu Dec 14 21:01:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 848775 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="lfVVoPpQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyQwT1JNQz9t3F for ; Fri, 15 Dec 2017 08:01:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbdLNVBn (ORCPT ); Thu, 14 Dec 2017 16:01:43 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:34251 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbdLNVB2 (ORCPT ); Thu, 14 Dec 2017 16:01:28 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBEKvAui093265; Thu, 14 Dec 2017 21:01:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=6pR/OGgtNoVaUNx02jYLFBWs7lZBdCTTlAE7s0W/6Ko=; b=lfVVoPpQqk05lnaXkWXnNZ6VpDy/jMnTmFx6jsE5/5bvj1YS4n+lNDdPznxQLsElbIor hDiUts7ViL93vh9GQWUgcDdRyxY8n5tfSYkqQRf/D1isgROZdcfTI+WKrNC8TZSuHDH6 ACWGvClMKYK0gwem3K83NZzJ1bVTV/xuKcfzOhiyTIq+ycJ3GGUEj31exrlMqSARmvTP WlVqMjciR5B/lj3ntq46qSrR49zt+AjRPTsnSZkEOiu6ZAg+nmBPILwD+5Xr76al4oaY RvVRjauf22yuICKjbQwX9SOQaE4Erkv8GWmuXx/zUoB3U84YsXWL/jx30SOm6W5wssU7 wA== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2ev0par2y0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:26 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id vBEL1Pxb031447 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:25 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vBEL1OOl032138; Thu, 14 Dec 2017 21:01:25 GMT Received: from slnelson-mint18.us.oracle.com (/10.159.251.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 14 Dec 2017 13:01:24 -0800 From: Shannon Nelson To: steffen.klassert@secunet.com Cc: netdev@vger.kernel.org Subject: [PATCH v2 ipsec-next 3/3] xfrm: wrap xfrmdev_ops with offload config Date: Thu, 14 Dec 2017 13:01:17 -0800 Message-Id: <1513285277-21092-4-git-send-email-shannon.nelson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> References: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8745 signatures=668648 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=891 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712140288 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There's no reason to define netdev->xfrmdev_ops if the offload facility is not CONFIG'd in. Signed-off-by: Shannon Nelson --- include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 2eaac7d..145d0de 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1697,7 +1697,7 @@ struct net_device { const struct ndisc_ops *ndisc_ops; #endif -#ifdef CONFIG_XFRM +#ifdef CONFIG_XFRM_OFFLOAD const struct xfrmdev_ops *xfrmdev_ops; #endif