From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753822AbcIIJbZ (ORCPT ); Fri, 9 Sep 2016 05:31:25 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:55720 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752325AbcIIJbI (ORCPT ); Fri, 9 Sep 2016 05:31:08 -0400 From: Harish Jenny K N To: Felipe Balbi CC: , Greg Kroah-Hartman , , Jim Baxter , Subject: [PATCH v1 2/2] usb: gadget: NCM: Protect dev->port_usb using dev->lock Date: Fri, 9 Sep 2016 11:30:42 +0200 Message-ID: <1473413442-2377-3-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 This commit incorporates findings from https://lkml.org/lkml/2016/4/25/594 The function has been modified to make sure we hold the dev lock when accessing the net device pointer. Acked-by: Jim Baxter Signed-off-by: Harish Jenny K N --- drivers/usb/gadget/function/u_ether.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 9c8c9ed..8cb0803 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -553,14 +553,16 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, spin_lock_irqsave(&dev->lock, flags); if (dev->port_usb) skb = dev->wrap(dev->port_usb, skb); - spin_unlock_irqrestore(&dev->lock, flags); if (!skb) { /* Multi frame CDC protocols may store the frame for * later which is not a dropped frame. */ if (dev->port_usb && - dev->port_usb->supports_multi_frame) + dev->port_usb->supports_multi_frame) { + spin_unlock_irqrestore(&dev->lock, flags); goto multiframe; + } + spin_unlock_irqrestore(&dev->lock, flags); goto drop; } } @@ -578,6 +580,7 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, req->zero = 0; else req->zero = 1; + spin_unlock_irqrestore(&dev->lock, flags); /* use zlp framing on tx for strict CDC-Ether conformance, * though any robust network rx path ignores extra padding. -- 1.7.9.5