From patchwork Tue Mar 18 16:32:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Stevens X-Patchwork-Id: 331475 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6D6202C00AE for ; Wed, 19 Mar 2014 03:32:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755210AbaCRQcj (ORCPT ); Tue, 18 Mar 2014 12:32:39 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:44996 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754708AbaCRQci (ORCPT ); Tue, 18 Mar 2014 12:32:38 -0400 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Mar 2014 10:32:38 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Mar 2014 10:32:35 -0600 Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 0F77419D8039 for ; Tue, 18 Mar 2014 10:32:32 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by b03cxnp08027.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2IGW2Pu11075932 for ; Tue, 18 Mar 2014 17:32:02 +0100 Received: from d03av01.boulder.ibm.com (localhost [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2IGWYxf017581 for ; Tue, 18 Mar 2014 10:32:35 -0600 Received: from lab1.dls (dyn9050022042.mts.ibm.com [9.50.22.42] (may be forged)) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s2IGWWRd017477 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 18 Mar 2014 10:32:34 -0600 Received: from lab1 (localhost.localdomain [127.0.0.1]) by lab1.dls (8.14.7/8.14.7) with ESMTP id s2IGWTjT003613; Tue, 18 Mar 2014 12:32:30 -0400 Message-Id: <201403181632.s2IGWTjT003613@lab1.dls> From: David L Stevens To: David Miller , Stephen Hemminger cc: netdev@vger.kernel.org Subject: [PATCH net] VXLAN: fix potential NULL dereference in arp_reduce() Date: Tue, 18 Mar 2014 12:32:29 -0400 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14031816-8236-0000-0000-000000E1BADA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes a NULL pointer dereference in the event of an skb allocation failure in arp_reduce(). Signed-Off-By: David L Stevens Acked-by: Cong Wang --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index eb59b14..570792c 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1315,6 +1315,9 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb) neigh_release(n); + if (reply == NULL) + goto out; + skb_reset_mac_header(reply); __skb_pull(reply, skb_network_offset(reply)); reply->ip_summed = CHECKSUM_UNNECESSARY;