Message ID | 20190214102436.5092-3-linus.walleij@linaro.org |
---|---|
State | Superseded, archived |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hdyWyzTY"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZDiaU/ds"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 440Xbb5hDGz9sML for <incoming@patchwork.ozlabs.org>; Thu, 14 Feb 2019 21:25:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OIijWiXZAKBS4Y8AXyOGFX64Gy49RgR0qoqiJXQkNkM=; b=hdyWyzTYN0mENy IVfrlCzWbMN9/iuDNPSFu3CwA5+u5X5Jk85u/tRLuDUVDFvPBu4OPx/VQHSYakJGym0AJdtrdz0x6 BjyHcj5aenEiHWe4yL2HlV7NOAnF6yt9ngYAjdrabWpZe1e5gwhjSr2qFQu7UTtlxqWRECG89A0SC 0CAuzfCUzNAlxf/2cb1er8B6Uco8AhN3IuZciBUBKB91Bi6khp5ROD92HGN8CeMMikJ1Kx7TTGztX bt1O+H1nhaPFh+Bd5eiHQ/MDv6kdhNGTNyGWOPSXAZZdzf9YawzZkmgHox7rBT55JIHl0wjFJWwbX akOstCcaigdxJt4216Qg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1guED1-000679-Ex; Thu, 14 Feb 2019 10:25:35 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guECV-0004S8-Gm for openwrt-devel@lists.openwrt.org; Thu, 14 Feb 2019 10:25:08 +0000 Received: by mail-lf1-x144.google.com with SMTP id n23so4144672lfl.4 for <openwrt-devel@lists.openwrt.org>; Thu, 14 Feb 2019 02:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QejVeuN9JlqnVwHudfbz2AR9dbAYL9NjcCDz/Vgr3MA=; b=ZDiaU/dskcTF0g8YrFhWt1RDdiYcqM3R9+07ZwEpexIiQYi8ipgPo+vhFnodkb2bxD 5XfuHIjrfCIzkLWoBOP2QtVOBao9wcQd/0BHOkrWJkpXN+IYO6pw51qRz4n7uFxg7ASl Ts27YZh/bq9AxkRsYWUI34PSi5S5zJrrEsA7+9nCksjHRhpmFXmbLrFl8H884YXYF0v/ Er9NeplRV2q3/DJtF4Y+S2koeiCUW1Vx9DzAXag3B2PYHyWLFylqS/3REAYqa7On/v1f igLl3JNJu0VuR/MeeLagEvDazQBimzwCSLfl7TAfKhGi9yaForQ3xkbBaxEzf73wrUhe YA9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QejVeuN9JlqnVwHudfbz2AR9dbAYL9NjcCDz/Vgr3MA=; b=k5LVNm5TzbKUA+Qbiyzj6ESt51UflaIhL3j/qc7k/NPfLMHvw3nSsxcxTmPK2bFbbk hVCTJXV/AcvyTAqJGf2QmZKtn+x1fPfun0wt2oeOjzIh4kRaKtD2F1t9k3zUPXcRT5kr NzNOx7fJ/sYgM8MLcmCgFTUZ4q0DYFloitTg6C9DOdzofGVCmp4LnX7u/OKwk+M/HXsr dN7y5S5CuYL96xjlcEKCZSymeTEy3hKX3xq8BCrOO1R6Ib4ja3ZO6vzUlxSXgqXE5Ef8 xvaQ3MQRRVCH1HqLfsw6adcq7TPcIHQ6pkqpgMFWQo6MZSaNsJVMfOoU17T6rZ7fLyvE 7LnQ== X-Gm-Message-State: AHQUAuaShI49LWz+kJq9KhvKTt+uDfKBFxYDcaJPJRHetRv+lp9+GIfK M3Bs+yDhHnCgoXySYRWxAvfPtUGjojk= X-Google-Smtp-Source: AHgI3IYEqKR7QUomImIsZEqcftLAW14oKFMh0TRzK9rRaYfZ2VmOJXv0jfmjRqulqRkrc01+ykdJbQ== X-Received: by 2002:ac2:4215:: with SMTP id y21mr2048953lfh.6.1550139901767; Thu, 14 Feb 2019 02:25:01 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id n189sm380392lfn.82.2019.02.14.02.24.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Feb 2019 02:25:00 -0800 (PST) From: Linus Walleij <linus.walleij@linaro.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, openwrt-devel@lists.openwrt.org Date: Thu, 14 Feb 2019 11:24:28 +0100 Message-Id: <20190214102436.5092-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214102436.5092-1-linus.walleij@linaro.org> References: <20190214102436.5092-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_022504_368316_3B6B8AB4 X-CRM114-Status: GOOD ( 13.67 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH 02/10] smsc95xx: Use skb_cow_head to deal with cloned skbs X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Woojung Huh <Woojung.Huh@microchip.com>, James Hughes <james.hughes@raspberrypi.org>, Liping Zhang <zlpnobody@gmail.com>, John Youn <johnyoun@synopsys.com>, Hauke Mehrtens <hauke@hauke-m.de>, Dave Taht <dave.taht@gmail.com>, Eric Dumazet <edumazet@google.com>, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <rafal@milecki.pl>, "David S . Miller" <davem@davemloft.net>, Felix Fietkau <nbd@nbd.name> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
Stable material from OpenWrt
|
expand
|
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index e29f4c0767eb..e719ecd69d01 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -2011,13 +2011,13 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, /* We do not advertise SG, so skbs should be already linearized */ BUG_ON(skb_shinfo(skb)->nr_frags); - if (skb_headroom(skb) < overhead) { - struct sk_buff *skb2 = skb_copy_expand(skb, - overhead, 0, flags); + /* Make writable and expand header space by overhead if required */ + if (skb_cow_head(skb, overhead)) { + /* Must deallocate here as returning NULL to indicate error + * means the skb won't be deallocated in the caller. + */ dev_kfree_skb_any(skb); - skb = skb2; - if (!skb) - return NULL; + return NULL; } if (csum) {