From patchwork Wed Nov 12 15:58:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David L Stevens X-Patchwork-Id: 410011 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 A60281400B6 for ; Thu, 13 Nov 2014 02:58:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753030AbaKLP6y (ORCPT ); Wed, 12 Nov 2014 10:58:54 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:33895 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752858AbaKLP6x (ORCPT ); Wed, 12 Nov 2014 10:58:53 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id sACFwoaO023373 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 Nov 2014 15:58:51 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id sACFwmCr017041 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Wed, 12 Nov 2014 15:58:49 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id sACFwmn1017126; Wed, 12 Nov 2014 15:58:48 GMT Received: from [10.154.152.10] (/10.154.152.10) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 12 Nov 2014 07:58:48 -0800 Message-ID: <546383B7.2090106@oracle.com> Date: Wed, 12 Nov 2014 10:58:47 -0500 From: David L Stevens Organization: Oracle Corporation User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org, Sowmini Varadhan Subject: [PATCH net-next] sunvnet: fix NULL pointer dereference X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes a NULL pointer dereference when __tx_port_find() doesn't find a matching port. Signed-off-by: David L Stevens Acked-by: Sowmini Varadhan --- drivers/net/ethernet/sun/sunvnet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 55d66c9..a556eba 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -958,6 +958,8 @@ vnet_select_queue(struct net_device *dev, struct sk_buff *skb, struct vnet *vp = netdev_priv(dev); struct vnet_port *port = __tx_port_find(vp, skb); + if (port == NULL) + return 0; return port->q_index; }