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: 12109719 X-Patchwork-Delegate: kuba@kernel.org 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BF89BC433E0 for ; Mon, 1 Mar 2021 13:34:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E91364DE8 for ; Mon, 1 Mar 2021 13:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235845AbhCANed (ORCPT ); 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-Google-Smtp-Source: ABdhPJw3k4r8JgUncNdDhkbexyVZJGTb73S8fwY4Vi7Kyi0DC3HHviucbdtcyDov+U8ZpGdWHpSNyg== 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 X-Patchwork-Delegate: kuba@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 Reviewed-by: Florian Fainelli --- net/dsa/tag_rtl4_a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From patchwork Mon Mar 1 13:32:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12109717 X-Patchwork-Delegate: kuba@kernel.org 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 324E0C433E0 for ; Mon, 1 Mar 2021 13:34:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 048D064DE8 for ; Mon, 1 Mar 2021 13:34:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235830AbhCANdx (ORCPT ); Mon, 1 Mar 2021 08:33:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235814AbhCANd3 (ORCPT ); Mon, 1 Mar 2021 08:33:29 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C12AC061788 for ; Mon, 1 Mar 2021 05:32:49 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id e7so25535873lft.2 for ; Mon, 01 Mar 2021 05:32:49 -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=cYZerRT2x1qlGnIcE8x6N2LpmT6kXCgWE2D5TP/WfCs=; b=wKzXFcDLjNyyRoslx3XcGuzfeszZwxSUcGtgTwhw+Y3Hp51/yhR3A4MGHWVgreAN1x hqUmNnCKT0MzuDnHrMC2sqDuere+4CpfTK30Zh9q3+YBF4hbk8WRE6AfH+ulCqd+/ozb IyIruRdLbFzaSSbSdHLXUvLm3RZfSdFWdRt3MwBk8GUsSX/YsN/vOJac3U5nBkkbcmWF PU6Ut6S+XWdx80tyfDhbi32War2XktED/mAnE/SQC0oAwLI9ey/c87+JWcaOu+MBDF1P os2EfNbn1k8m2rEyM8mxtZ9I9Z+xilAWMTg6dPcbiiHg5bA9yVaWIDMW3YEwOrIcXZan pTxw== 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=cYZerRT2x1qlGnIcE8x6N2LpmT6kXCgWE2D5TP/WfCs=; b=QiOZ6AC8x3BGarY7QKEAz8QuMGQ7c3Y1RV6feSRUiNK6LATIdJRV5Rc875rl8Hq/XM O5b/eqFcnlSqoNPY3ggPFlOqQCd1uYrUQ7Efcc9i9EH7BZSfMnfgic2SvueVNVXqjie3 KUu20KhTmmDmckU2Ur8bzxwPrIKyCkoGrB3qTERp8VwrHKU9MnTIFrSKH2+sIBULjHg4 dZ6Whc1z+MhnTreniXjMvQAgHm8PU3HMIEna3ClpcQub/W2ShERIF5csR/F+BD3i/UO/ QOgMvNq4bzhS6wiXjUmgjHsKLgXHPRP5Me8GDRy82I8O6TaqxL552Ccmchn7rkvYBcQg riBA== X-Gm-Message-State: AOAM5320+pwStEPr84/OhFPg9wG4SHktfO/+8P1kFv6x0vb9Sg7s9yL2 LzE9zwyBsyBrAW9aLRLNafbC2Q== X-Google-Smtp-Source: ABdhPJzMORv9w8mlPRk+LNWq8NeIXXQP2/52SsAyKTL6Wqrcjlnlu0ez3dLFrZtpnyQTDyvo9KSG3w== X-Received: by 2002:a19:7d06:: with SMTP id y6mr9808950lfc.644.1614605567969; Mon, 01 Mar 2021 05:32:47 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 05:32:47 -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 2/3] net: dsa: rtl4_a: Drop skb_cow_head() Date: Mon, 1 Mar 2021 14:32:40 +0100 Message-Id: <20210301133241.1277164-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210301133241.1277164-1-linus.walleij@linaro.org> References: <20210301133241.1277164-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The DSA core already provides the tag headroom, drop this. Fixes: 86dd9868b878 ("net: dsa: tag_rtl4_a: Support also egress tags") Reported-by: Andrew Lunn Reported-by: DENG Qingfang Cc: Mauri Sandberg Signed-off-by: Linus Walleij Reviewed-by: Florian Fainelli --- net/dsa/tag_rtl4_a.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index 804d756dd80a..8098d81f660b 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -42,8 +42,6 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, /* Pad out to at least 60 bytes */ if (__skb_put_padto(skb, ETH_ZLEN, false)) return NULL; - if (skb_cow_head(skb, RTL4_A_HDR_LEN) < 0) - return NULL; netdev_dbg(dev, "add realtek tag to package to port %d\n", dp->index); From patchwork Mon Mar 1 13:32:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12109721 X-Patchwork-Delegate: kuba@kernel.org 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 04AB3C433DB for ; Mon, 1 Mar 2021 13:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C46CA64DE8 for ; Mon, 1 Mar 2021 13:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235780AbhCANel (ORCPT ); Mon, 1 Mar 2021 08:34:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235748AbhCANdb (ORCPT ); Mon, 1 Mar 2021 08:33:31 -0500 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23A20C06178A for ; Mon, 1 Mar 2021 05:32:51 -0800 (PST) Received: by mail-lj1-x230.google.com with SMTP id e2so12222428ljo.7 for ; Mon, 01 Mar 2021 05:32:51 -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=wQalGovUJHUxAGD0LzoropIg8ifJImgRXYB/UBdo/FM=; b=EcfV03XOGJFa9Su6i6rEg7ozmay2Y73SCwaXy9mUdFcf8VZB9iqoLYtxN1eJ0TZMyv GiIuYkz9/oeMG/srJECF6wVRcmfw2T7N7jg8MtFawuKNqscHpDP7gsl6JgXBl/k4s4Wi 0TugNsfm0WtHV7xLute+ltCZkoCPfuX5AxJuseCPTWO73hFfRV7h9/jCIh97tlRz8a23 fLlHUATlHqnuHUVVrCWkt5dSZa153HOQ/VK49Wjv1pFffmJtrt6P2HI2yyq1XerJKGs2 CqLC+JYqhzzYhhiUNKGXTXgUFCGONenhdiwhJBh8D2++tRe2wILIX2H1hwpJ/sk5bjgM 12VA== 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=wQalGovUJHUxAGD0LzoropIg8ifJImgRXYB/UBdo/FM=; b=B9iFO1DzOzAN9sVXIAl7kkF+Ap/mDD0bHYAKl9me+nHaDvHJ5TQU4vQX2p9ias3h+J 3tWE9lD25DQjb4HbqR4ZeSqf2p/ZJcXxf+mhEPVoAfJAaYGxsZTzjBy1esPb5KJpDqUH JRe4Cl4IsEOr8hs1JQ3SbIvJkeDjPa7YUbNM223Q+q7HR0iHixsEgZffENJnRsbvdSEd v84TCCSZJody+RDLKYOIjnZmte9SM0OOM3qZInsalVDQtFsywIW4QivraJ3Hm7wsQH7m hfvEhTBkNHdyv2YQ/5z0Ud+nsErIKqvW+sQeZDtThCpZXUlD4XOCwfvss456z/M3fPaS OxYw== X-Gm-Message-State: AOAM531cs8Woq54y3Phl4xSozUI9uqFRzMcpZTe5ZGzm3xYXP20bhqWc /iUgxAlAafSjN8MR6qOwJGNRMw== X-Google-Smtp-Source: ABdhPJxR/s/YeU6BHx10y93yXvwFOHeXlqvVnTk3eN0xnU8qd6k8rKSlKypTE52EJrnMhmlamjGZag== X-Received: by 2002:a2e:9b90:: with SMTP id z16mr9190897lji.71.1614605569686; Mon, 01 Mar 2021 05:32:49 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 05:32:49 -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 3/3] net: dsa: rtl4_a: Syntax fixes Date: Mon, 1 Mar 2021 14:32:41 +0100 Message-Id: <20210301133241.1277164-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210301133241.1277164-1-linus.walleij@linaro.org> References: <20210301133241.1277164-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Some errors spotted in the initial patch: use reverse christmas tree for nice code looks and fix a spelling mistake. Reported-by: Andrew Lunn Reported-by: DENG Qingfang Cc: Mauri Sandberg Signed-off-by: Linus Walleij Reviewed-by: Florian Fainelli --- net/dsa/tag_rtl4_a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index 8098d81f660b..9da56c5ea9dc 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -36,8 +36,8 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, { struct dsa_port *dp = dsa_slave_to_port(dev); u8 *tag; - u16 *p; u16 out; + u16 *p; /* Pad out to at least 60 bytes */ if (__skb_put_padto(skb, ETH_ZLEN, false)) @@ -55,7 +55,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, *p = htons(RTL4_A_ETHERTYPE); out = (RTL4_A_PROTOCOL_RTL8366RB << 12) | (2 << 8); - /* The lower bits is the port numer */ + /* The lower bits are the port numer */ out |= (u8)dp->index; p = (u16 *)(tag + 2); *p = htons(out);