From patchwork Mon Mar 1 13:32:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 388635 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3353031jap; Mon, 1 Mar 2021 05:34:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3quT3JDRCRB1FPaeYXaRUpgRg/2ugRTtRf7mo6TGoGoXkJ4Yla+LMAat0t4s/GKj2i5A+ X-Received: by 2002:aa7:cb8a:: with SMTP id r10mr16384060edt.152.1614605676772; Mon, 01 Mar 2021 05:34:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614605676; cv=none; d=google.com; s=arc-20160816; b=ZnWaoS36zGSD8KpJFPo8aAUd9wTT/JaptnML8/qK7/h81UuKqq9tTMgC0dlI8u1WVA LHpLUC0qlKiWlorA80ganOJ+bcJQTRMxiypW5ldSqK2peJ2QS/1zGH6jfjpo6ijUAXMt iTOzBzWzxJzCCd3zg3tNDswsusGimrfhZTdqrvJxWdXN2qxlqa3B31atOSMMGl+gtF6f 6sCt0DLCKNaiwnFIrh1R3GiRFWPKvl3Fixb3befiSgtyFaH9TmfzdNuv2R+/13iDoiTz ndzvfW4YwxziWFkwQgB2DpawOyoFG3ttvpo2W0Sg5aNHG1nuk06XsPctCGRNMQG2menl we2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=pcHwrN0wdUgHRkW93Ilur7+SDuQt+zWeqr8EgwbfNpo=; b=Yd9OaHx1FH1/Oi7UycTSHqoo9aqj68nPGm7WrD9FjWkQx7TyQWyqG6xckhHnCB5N89 ZAPQlPLkzpuZSpwI0DkpRFTB7ezZSk3TkLZRGU0c/doop3mQDeewmDrL5yv7jzbHYtUe Ag02E3HtGpXWSRZUax8NsU9DvLNqhylViI5q6Ph1YknB7UV0Nl53DMPgQl58twwJysRz WG1UwoNoGKHWWYCb7B0AVprTCI7qbdjJXabIL7uQhrH+oPpLndJOFcyNL8pXSioeU3YC RcuE0ysfICEcd7X52ABh65HBcdHSmCo4/dYhK5SSF+fRuPLCbKjbTqFuOVjwBXrJTf7A ltfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nDVoUXsC; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q15si11037053edd.127.2021.03.01.05.34.36; Mon, 01 Mar 2021 05:34:36 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nDVoUXsC; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235845AbhCANed (ORCPT + 9 others); Mon, 1 Mar 2021 08:34:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235777AbhCANd2 (ORCPT ); Mon, 1 Mar 2021 08:33:28 -0500 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BE32C061756 for ; Mon, 1 Mar 2021 05:32:47 -0800 (PST) Received: by mail-lj1-x22f.google.com with SMTP id p15so10472623ljc.13 for ; Mon, 01 Mar 2021 05:32:47 -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:mime-version :content-transfer-encoding; bh=pcHwrN0wdUgHRkW93Ilur7+SDuQt+zWeqr8EgwbfNpo=; b=nDVoUXsCLk26fGNNhSXXaXw6sR/qR9qagJ+MuZURL55GuNY25R96U9wauI0HryK0jp ez7dndZwAJfpv9ohgkDmAK7JWHMlNfjWwJWrnCs8mlgFSht5bk+cORgnPvDAH9fkNCMI SWEwSSNKp43YmycTufGOGOgVKUWbWDQYTtWKC/Hpqn58qT5O72+ejnFVuxhkk2fAJ2aR /9cRkhp0HkG+iXcY98nQAiE05WsOFVtx2FH3fHKk9+Fdp0dPDIpv4gy+L+cuDWyUhRyq 7SLKXrTzus5JMedgDKnDonZGGEIdb0wwiJhr7r6AEW6jl6mo9TN5u3a7/3UdooMa9Mf/ d8Yg== 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:mime-version :content-transfer-encoding; bh=pcHwrN0wdUgHRkW93Ilur7+SDuQt+zWeqr8EgwbfNpo=; b=XCbP5FWCubGxk8gJrWMlZkDKMtykOJJkHEmEjxk+PiIWy4afcXg/MefkMZKLf/aptP tNhSpa0Vxg3BFWSSFTg8/TyGLPbbzuHiCXnLWBGmLBt+JfmafH/wDCQP5iUrOXJPGwBv yhzJFzwTyeaPyf8DKN1v5GG+DqLZArbs9VBm+YV5w2QzW6hER/XOfyNQHdk2PVHqpMg/ q0wnVcErxlThoOJdxeybxJnFJex6gatw2/WulAqNBfHYxnIs56bZjDz1SiB/KicjS5u9 p8t9Ob9acPqMY1HPPn8w4YEz5+e78GEhrpr81q5HkC4ggjS3AFptDVe9tO4scYzH6FSC p7ig== X-Gm-Message-State: AOAM531vqAJHxYc2WWrs3WWMULBdMEduwCjb0jaLn9Jb3aYFTmkFy2Kf bfTxZF9Rr1Ca280kakwQKZS1fQ== X-Received: by 2002:a2e:9791:: with SMTP id y17mr5165862lji.343.1614605566175; Mon, 01 Mar 2021 05:32:46 -0800 (PST) Received: from localhost.localdomain (c-d7cb225c.014-348-6c756e10.bbcust.telenor.se. [92.34.203.215]) by smtp.gmail.com with ESMTPSA id c9sm2310066lft.144.2021.03.01.05.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 05:32:45 -0800 (PST) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Linus Walleij , DENG Qingfang , Mauri Sandberg Subject: [PATCH net 1/3] net: dsa: rtl4_a: Pad using __skb_put_padto() Date: Mon, 1 Mar 2021 14:32:39 +0100 Message-Id: <20210301133241.1277164-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The eth_skb_pad() function will cause a double free on failure since dsa_slave_xmit() will try to free the frame if we return NULL. Fix this by using __skb_put_padto() instead. Fixes: 86dd9868b878 ("net: dsa: tag_rtl4_a: Support also egress tags") Reported-by: DENG Qingfang Cc: Mauri Sandberg Signed-off-by: Linus Walleij --- net/dsa/tag_rtl4_a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2 Reviewed-by: Florian Fainelli diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index c17d39b4a1a0..804d756dd80a 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -40,7 +40,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, u16 out; /* Pad out to at least 60 bytes */ - if (unlikely(eth_skb_pad(skb))) + if (__skb_put_padto(skb, ETH_ZLEN, false)) return NULL; if (skb_cow_head(skb, RTL4_A_HDR_LEN) < 0) return NULL;