From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753791AbcIIJbL (ORCPT ); Fri, 9 Sep 2016 05:31:11 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:55706 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753379AbcIIJbE (ORCPT ); Fri, 9 Sep 2016 05:31:04 -0400 From: Harish Jenny K N To: Felipe Balbi CC: , Greg Kroah-Hartman , , Jim Baxter , Subject: [PATCH v1 1/2] usb: gadget: u_ether: fix another dereference after null check Date: Fri, 9 Sep 2016 11:30:41 +0200 Message-ID: <1473413442-2377-2-git-send-email-harish_kandiga@mentor.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1473413442-2377-1-git-send-email-harish_kandiga@mentor.com> References: <1473413442-2377-1-git-send-email-harish_kandiga@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dev->port_usb is checked for null pointer previously, so dev->port_usb might be null during no zlp check, fix it by adding null pointer check. Acked-by: Jim Baxter Signed-off-by: Harish Jenny K N --- drivers/usb/gadget/function/u_ether.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 3be4b93..9c8c9ed 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -571,7 +571,8 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, req->complete = tx_complete; /* NCM requires no zlp if transfer is dwNtbInMaxSize */ - if (dev->port_usb->is_fixed && + if (dev->port_usb && + dev->port_usb->is_fixed && length == dev->port_usb->fixed_in_len && (length % in->maxpacket) == 0) req->zero = 0; -- 1.7.9.5