From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6EAEC33C9E for ; Sat, 11 Jan 2020 10:20:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81D9220848 for ; Sat, 11 Jan 2020 10:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738009; bh=vinS0EQcHQyalTCu/vV59w1aPvFPeGkiIDdZxUWu1VQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yuRcVJ8ryQF5HdH5uckCVtQmbaobC5fK21cuvR7V0ib3SpLxH7sa5Nvu69+b7ve3D 292IFxiWBFucSh2zJJHbW8e+q+CF16CRf5eD+y3bk/bmbP/2JzkYn2Lo/2FdQ8wRrL JqrY5nn/lhwElg76ylvp4aN3LYJUzESC3WgtHSE8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730618AbgAKKUG (ORCPT ); Sat, 11 Jan 2020 05:20:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:40842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729320AbgAKKUE (ORCPT ); Sat, 11 Jan 2020 05:20:04 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F51A205F4; Sat, 11 Jan 2020 10:20:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738004; bh=vinS0EQcHQyalTCu/vV59w1aPvFPeGkiIDdZxUWu1VQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1B5k/UkXbKBQ2ujOD6BGSC1NDMiiVpEgL26Ejqml5tcY+js59HogBhTeK6wtJI0lq rE1802dyA0uuRfU/na8nP8pn0BLLBpWuzlH8IcfqmdSWZ82VueaGbIkZozExvqRgGb hdrm/7M8mguOFrL/kQIJ85H931FBVR7vgfHu2QIk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , RENARD Pierre-Francois , Stefan Wahren , Woojung Huh , Microchip Linux Driver Support , "David S. Miller" Subject: [PATCH 4.19 71/84] net: usb: lan78xx: fix possible skb leak Date: Sat, 11 Jan 2020 10:50:48 +0100 Message-Id: <20200111094911.546097742@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094845.328046411@linuxfoundation.org> References: <20200111094845.328046411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 47240ba0cd09bb6fe6db9889582048324999dfa4 ] If skb_linearize() fails, we need to free the skb. TSO makes skb bigger, and this bug might be the reason Raspberry Pi 3B+ users had to disable TSO. Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver") Signed-off-by: Eric Dumazet Reported-by: RENARD Pierre-Francois Cc: Stefan Wahren Cc: Woojung Huh Cc: Microchip Linux Driver Support Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/lan78xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2736,11 +2736,6 @@ static int lan78xx_stop(struct net_devic return 0; } -static int lan78xx_linearize(struct sk_buff *skb) -{ - return skb_linearize(skb); -} - static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev, struct sk_buff *skb, gfp_t flags) { @@ -2751,8 +2746,10 @@ static struct sk_buff *lan78xx_tx_prep(s return NULL; } - if (lan78xx_linearize(skb) < 0) + if (skb_linearize(skb)) { + dev_kfree_skb_any(skb); return NULL; + } tx_cmd_a = (u32)(skb->len & TX_CMD_A_LEN_MASK_) | TX_CMD_A_FCS_;