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); }