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=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 90909C433E0 for ; Wed, 27 May 2020 15:55:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B4E520776 for ; Wed, 27 May 2020 15:55:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PAMb3Gig" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388530AbgE0PzN (ORCPT ); Wed, 27 May 2020 11:55:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390626AbgE0Pyw (ORCPT ); Wed, 27 May 2020 11:54:52 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29AC7C05BD1E; Wed, 27 May 2020 08:54:52 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id x10so10268752plr.4; Wed, 27 May 2020 08:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=nkIhbxtFT/sWyLG+CNPMvzFZfh5YwCelX3IPeKtDVng=; b=PAMb3Gighhz0cCKhjZLQ89rDfM+umkVZTkpYgFwBdzZ9PIGR1KNuJfANRSBsICHGU1 9GFY4+NhktZozymnBZgQaGPkn8QdPxDOXGhFk13RvLQfW7JVN2KYbsdVXfBT1OinJLIp zrRy0l+YVDGcMRQy8Ldm4ZecscejFQHzikG3HLWm++8UC3ai8KnWZCyKH6z7T/HA1xRI Wp+WUBUbWpR2kBaZ0JpFXShORG+eXejQ1vCRS83kPuIkPDQqhhjsTVcFK0GFU7CbfTMs dACufN3iOpLHsbWp1FGFQTUumq0BZHbJAIhG4FZ5GeQo+es6H96EK3UqJhZ/+Te+5OLe Y23A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=nkIhbxtFT/sWyLG+CNPMvzFZfh5YwCelX3IPeKtDVng=; b=VTFzvqV8dkwr6K3401itxGBMTwC/kf60dgg1UExx0SDsciPoRL8jZsRcDUNi2ZPYqL g4eNnaOBZwpzdA3A6AH42DXVzZ2pSuJR6+p8E4mVdL8h20Gea/3oY74RMAzOLSBVo6Np e0MHf6VW07iMxisYI/HfLkuJfGWmqywdTKPF5eV6xD75APqL8IbmWkmOhHCkP/K0zaL3 JtZi8G2v1UTZfy4XIOKsijtNfO3BG+oEewqSikwPkM9MfhhfSuRwZAX6pH9Z6piKX7FX 6sYtrXbmEz1Udm6quaUCKI13Rm/wZsaCueVC4q5vKOlDx8Doq/K63eC5ftyILemkbFx3 jVQQ== X-Gm-Message-State: AOAM533JrVD2xKcTbGKafB6hE5xCQ+9xrvi2rGh4y2PSaCPzePXbXsTJ yXCMvyvkhF67Y5+AKoRhet8= X-Google-Smtp-Source: ABdhPJxjWquEPV+JeRdzbhyTylh3GgQILPCaziRrufi5RFxgpIErfBy/fC56S/kQiDi7y42BfuoXZQ== X-Received: by 2002:a17:902:9882:: with SMTP id s2mr6368400plp.184.1590594891507; Wed, 27 May 2020 08:54:51 -0700 (PDT) Received: from ubuntu-s3-xlarge-x86 ([2604:1380:4111:8b00::1]) by smtp.gmail.com with ESMTPSA id q44sm3286859pja.2.2020.05.27.08.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 08:54:50 -0700 (PDT) Date: Wed, 27 May 2020 08:54:47 -0700 From: Nathan Chancellor To: Bartosz Golaszewski Cc: John Crispin , Sean Wang , Mark Lee , "David S . Miller" , Jakub Kicinski , Matthias Brugger , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Fabien Parent , Stephane Le Provost , Pedro Tsai , Andrew Perepech , Bartosz Golaszewski Subject: Re: [PATCH] net: ethernet: mtk-star-emac: fix error path in RX handling Message-ID: <20200527155447.GA568403@ubuntu-s3-xlarge-x86> References: <20200527092404.3567-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200527092404.3567-1-brgl@bgdev.pl> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 27, 2020 at 11:24:04AM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > The dma_addr field in desc_data must not be overwritten until after the > new skb is mapped. Currently we do replace it with uninitialized value > in error path. This change fixes it by moving the assignment before the > label to which we jump after mapping or allocation errors. > > Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver") > Reported-by: Nathan Chancellor > Signed-off-by: Bartosz Golaszewski Tested-by: Nathan Chancellor # build > --- > drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c > index b74349cede28..72bb624a6a68 100644 > --- a/drivers/net/ethernet/mediatek/mtk_star_emac.c > +++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c > @@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) > goto push_new_skb; > } > > + desc_data.dma_addr = new_dma_addr; > + > /* We can't fail anymore at this point: it's safe to unmap the skb. */ > mtk_star_dma_unmap_rx(priv, &desc_data); > > @@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) > netif_receive_skb(desc_data.skb); > > push_new_skb: > - desc_data.dma_addr = new_dma_addr; > desc_data.len = skb_tailroom(new_skb); > desc_data.skb = new_skb; > > -- > 2.25.0 > 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=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 CC32FC433E0 for ; Wed, 27 May 2020 16:36:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 76FAE20899 for ; Wed, 27 May 2020 16:36:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Kct2kH4R"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PAMb3Gig" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76FAE20899 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rItjM7hoOMLGSn38I4DlWwUhEESYuLd0IZIejp4umWs=; b=Kct2kH4RYOtRoY GtU8JFYkJJ7YKLMOP6KIXVk45wPmGnWczmLcopBX08oUdHi/fZ3xsbw+Jnlh6gibL8e74gG3Ny7RV ByCJ1b/We4EUnonl5fJUtx2kDXVIRENjBqCNLfeRrmRHqehH4+lwCPIr264PBAVDaI5W3iXbMma1N nImM7/pakdZZlGoLWmlZsc444AnblaBFurtQwIjJjqSDWy3ONx7MD3ByvjRbESoPyKKNmOII5iGSg vOmBmudem8pgtJ9nX1jJXbcZLsFVJ4eQD6vAJODKEBFWaL/+KjBChxJQtx9i9EJw0Cfx+j9a5M3qX FI7Teez2lWkCGb2af+ew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdz2M-0006lU-0U; Wed, 27 May 2020 16:36:14 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdyOK-0004Er-IF; Wed, 27 May 2020 15:54:54 +0000 Received: by mail-pl1-x642.google.com with SMTP id m7so10281311plt.5; Wed, 27 May 2020 08:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=nkIhbxtFT/sWyLG+CNPMvzFZfh5YwCelX3IPeKtDVng=; b=PAMb3Gighhz0cCKhjZLQ89rDfM+umkVZTkpYgFwBdzZ9PIGR1KNuJfANRSBsICHGU1 9GFY4+NhktZozymnBZgQaGPkn8QdPxDOXGhFk13RvLQfW7JVN2KYbsdVXfBT1OinJLIp zrRy0l+YVDGcMRQy8Ldm4ZecscejFQHzikG3HLWm++8UC3ai8KnWZCyKH6z7T/HA1xRI Wp+WUBUbWpR2kBaZ0JpFXShORG+eXejQ1vCRS83kPuIkPDQqhhjsTVcFK0GFU7CbfTMs dACufN3iOpLHsbWp1FGFQTUumq0BZHbJAIhG4FZ5GeQo+es6H96EK3UqJhZ/+Te+5OLe Y23A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=nkIhbxtFT/sWyLG+CNPMvzFZfh5YwCelX3IPeKtDVng=; b=JAEhq6OwdEVRH3LtcwGd7voD0W3QZCA6KG4xc+mzfGRcBXUgjzGdbxc85inywLRCZd 40jZ9Cbx2aTXiczp0ds0NQ50+MuAEG7CtIfGbuvU09BW0Tou6yeyAeL71KIBzEyjecw4 9vvIBKBEuae9qwBd7fyfyfPRK6T+uADY653sWzWrHT4KjBLdj44EzBbHyw7CxUQH10cJ q9f0wjH2fPo5y3qjS5JwP1egKaO6+qR/R9nvVArTyQqoFM1mnVOR1f8PJ7nvtzxe4SG4 CdiNc1rWeWGKmA1KagjH7a5tp6q/8ywkYiZPVJMKigGh9pBHZiSgfU1UHAKrF1XwxyGF jcsQ== X-Gm-Message-State: AOAM5326ZGpJgz7RNhGqOH/t3eQSm92dfeJHspl9K5ZCJnSq8AvQ5E3X rn7J92orMcGAWTrbdxhqNogrl0q602A= X-Google-Smtp-Source: ABdhPJxjWquEPV+JeRdzbhyTylh3GgQILPCaziRrufi5RFxgpIErfBy/fC56S/kQiDi7y42BfuoXZQ== X-Received: by 2002:a17:902:9882:: with SMTP id s2mr6368400plp.184.1590594891507; Wed, 27 May 2020 08:54:51 -0700 (PDT) Received: from ubuntu-s3-xlarge-x86 ([2604:1380:4111:8b00::1]) by smtp.gmail.com with ESMTPSA id q44sm3286859pja.2.2020.05.27.08.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 08:54:50 -0700 (PDT) Date: Wed, 27 May 2020 08:54:47 -0700 From: Nathan Chancellor To: Bartosz Golaszewski Subject: Re: [PATCH] net: ethernet: mtk-star-emac: fix error path in RX handling Message-ID: <20200527155447.GA568403@ubuntu-s3-xlarge-x86> References: <20200527092404.3567-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200527092404.3567-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200527_085452_713059_49544BA6 X-CRM114-Status: GOOD ( 15.49 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephane Le Provost , Bartosz Golaszewski , netdev@vger.kernel.org, Sean Wang , linux-kernel@vger.kernel.org, Mark Lee , Fabien Parent , Pedro Tsai , linux-mediatek@lists.infradead.org, Andrew Perepech , John Crispin , Matthias Brugger , Jakub Kicinski , "David S . Miller" , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Wed, May 27, 2020 at 11:24:04AM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > The dma_addr field in desc_data must not be overwritten until after the > new skb is mapped. Currently we do replace it with uninitialized value > in error path. This change fixes it by moving the assignment before the > label to which we jump after mapping or allocation errors. > > Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver") > Reported-by: Nathan Chancellor > Signed-off-by: Bartosz Golaszewski Tested-by: Nathan Chancellor # build > --- > drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c > index b74349cede28..72bb624a6a68 100644 > --- a/drivers/net/ethernet/mediatek/mtk_star_emac.c > +++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c > @@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) > goto push_new_skb; > } > > + desc_data.dma_addr = new_dma_addr; > + > /* We can't fail anymore at this point: it's safe to unmap the skb. */ > mtk_star_dma_unmap_rx(priv, &desc_data); > > @@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) > netif_receive_skb(desc_data.skb); > > push_new_skb: > - desc_data.dma_addr = new_dma_addr; > desc_data.len = skb_tailroom(new_skb); > desc_data.skb = new_skb; > > -- > 2.25.0 > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A8975C433DF for ; Wed, 27 May 2020 16:35:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 71A222084C for ; Wed, 27 May 2020 16:35:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QY0Yp0pp"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PAMb3Gig" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71A222084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Sq8lTW1x+PDh0F2VP0NNg9OBPLaWbeUGqBoKPp/aUB8=; b=QY0Yp0ppFG644V WK+lY9c5pmdSQErfPF11xo2kSX/1zDWSnRxblX7wcxFmpUCxMaKThewgx3l5deATKmsXgMe78Zh/z 3zj0edFo4Qmtj6a3EibKnErwwwAAvHZHewQMin24uDkgfixJqrBvE3Blky/NatNop3Q4W6wXOJzgX yC1MlFPC+8efSDHHAMMg+Terl86ZVOoCHrHwG3rmjDQTbzZ+nwoUiHjFCvJBqIyxNl3ywJmyMBr2p z0hhoYjPnAndsgMjHpZjj4sKIxxK8ZGujfTZ+gXzzUjPtvjgFk4QRzciSgy2a0qnebCeUW7RkYAuj jq3AGr0I4VMSrI7nNYnw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdz21-0006Tu-PC; Wed, 27 May 2020 16:35:53 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdyOK-0004Er-IF; Wed, 27 May 2020 15:54:54 +0000 Received: by mail-pl1-x642.google.com with SMTP id m7so10281311plt.5; Wed, 27 May 2020 08:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=nkIhbxtFT/sWyLG+CNPMvzFZfh5YwCelX3IPeKtDVng=; b=PAMb3Gighhz0cCKhjZLQ89rDfM+umkVZTkpYgFwBdzZ9PIGR1KNuJfANRSBsICHGU1 9GFY4+NhktZozymnBZgQaGPkn8QdPxDOXGhFk13RvLQfW7JVN2KYbsdVXfBT1OinJLIp zrRy0l+YVDGcMRQy8Ldm4ZecscejFQHzikG3HLWm++8UC3ai8KnWZCyKH6z7T/HA1xRI Wp+WUBUbWpR2kBaZ0JpFXShORG+eXejQ1vCRS83kPuIkPDQqhhjsTVcFK0GFU7CbfTMs dACufN3iOpLHsbWp1FGFQTUumq0BZHbJAIhG4FZ5GeQo+es6H96EK3UqJhZ/+Te+5OLe Y23A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=nkIhbxtFT/sWyLG+CNPMvzFZfh5YwCelX3IPeKtDVng=; b=JAEhq6OwdEVRH3LtcwGd7voD0W3QZCA6KG4xc+mzfGRcBXUgjzGdbxc85inywLRCZd 40jZ9Cbx2aTXiczp0ds0NQ50+MuAEG7CtIfGbuvU09BW0Tou6yeyAeL71KIBzEyjecw4 9vvIBKBEuae9qwBd7fyfyfPRK6T+uADY653sWzWrHT4KjBLdj44EzBbHyw7CxUQH10cJ q9f0wjH2fPo5y3qjS5JwP1egKaO6+qR/R9nvVArTyQqoFM1mnVOR1f8PJ7nvtzxe4SG4 CdiNc1rWeWGKmA1KagjH7a5tp6q/8ywkYiZPVJMKigGh9pBHZiSgfU1UHAKrF1XwxyGF jcsQ== X-Gm-Message-State: AOAM5326ZGpJgz7RNhGqOH/t3eQSm92dfeJHspl9K5ZCJnSq8AvQ5E3X rn7J92orMcGAWTrbdxhqNogrl0q602A= X-Google-Smtp-Source: ABdhPJxjWquEPV+JeRdzbhyTylh3GgQILPCaziRrufi5RFxgpIErfBy/fC56S/kQiDi7y42BfuoXZQ== X-Received: by 2002:a17:902:9882:: with SMTP id s2mr6368400plp.184.1590594891507; Wed, 27 May 2020 08:54:51 -0700 (PDT) Received: from ubuntu-s3-xlarge-x86 ([2604:1380:4111:8b00::1]) by smtp.gmail.com with ESMTPSA id q44sm3286859pja.2.2020.05.27.08.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 08:54:50 -0700 (PDT) Date: Wed, 27 May 2020 08:54:47 -0700 From: Nathan Chancellor To: Bartosz Golaszewski Subject: Re: [PATCH] net: ethernet: mtk-star-emac: fix error path in RX handling Message-ID: <20200527155447.GA568403@ubuntu-s3-xlarge-x86> References: <20200527092404.3567-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200527092404.3567-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200527_085452_713059_49544BA6 X-CRM114-Status: GOOD ( 15.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephane Le Provost , Bartosz Golaszewski , netdev@vger.kernel.org, Sean Wang , linux-kernel@vger.kernel.org, Mark Lee , Fabien Parent , Pedro Tsai , linux-mediatek@lists.infradead.org, Andrew Perepech , John Crispin , Matthias Brugger , Jakub Kicinski , "David S . Miller" , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, May 27, 2020 at 11:24:04AM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > The dma_addr field in desc_data must not be overwritten until after the > new skb is mapped. Currently we do replace it with uninitialized value > in error path. This change fixes it by moving the assignment before the > label to which we jump after mapping or allocation errors. > > Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver") > Reported-by: Nathan Chancellor > Signed-off-by: Bartosz Golaszewski Tested-by: Nathan Chancellor # build > --- > drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c > index b74349cede28..72bb624a6a68 100644 > --- a/drivers/net/ethernet/mediatek/mtk_star_emac.c > +++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c > @@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) > goto push_new_skb; > } > > + desc_data.dma_addr = new_dma_addr; > + > /* We can't fail anymore at this point: it's safe to unmap the skb. */ > mtk_star_dma_unmap_rx(priv, &desc_data); > > @@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) > netif_receive_skb(desc_data.skb); > > push_new_skb: > - desc_data.dma_addr = new_dma_addr; > desc_data.len = skb_tailroom(new_skb); > desc_data.skb = new_skb; > > -- > 2.25.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel