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=-13.4 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, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT 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 8BE23C43218 for ; Fri, 26 Apr 2019 13:06:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A035208C3 for ; Fri, 26 Apr 2019 13:06:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fYPOCOI+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726308AbfDZNGp (ORCPT ); Fri, 26 Apr 2019 09:06:45 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:45827 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbfDZNGp (ORCPT ); Fri, 26 Apr 2019 09:06:45 -0400 Received: by mail-ed1-f67.google.com with SMTP id k92so614758edc.12 for ; Fri, 26 Apr 2019 06:06:43 -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:user-agent; bh=RpGm3QYEPVXEcGYWcm+rETjqBY4foCdFJf/nW76HRXY=; b=fYPOCOI+9KKZjBNkTVMgUwncOeIhjq2vAXftE5U9FDBDz0VOAEgnmSX5S/MMgbmAfo x0lFKrLVPunnOn93cj53lKpr/SIGfeRePIukn/IHIkydlBjC1BUh8Z/XnJ/KfN7OXe92 MOmlHQG3WmfbZjOIIR1TMBXYzuZEOEssvPXDy6OedOasnqV7R/mCzPMCXGFOxuuUuuHW cOb+PEECzK8z/6GXwABTqOWOl0SnrN27PvjZl21dngtTZglUDCmBO5hUknuRLg9fo2XK sSTNJuf0AhpQy5pWwYFTgGg4zK9vPLDGHCaBR2yqDg6oQnw5PNV5sW2IbqfgDc3cT8h9 XNXw== 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:user-agent; bh=RpGm3QYEPVXEcGYWcm+rETjqBY4foCdFJf/nW76HRXY=; b=BC8BvDZ7atWOFaf+8LDOn5wtKCuAZ8keN8ObWq53GtXI47/eJOO7wyVRS/3AmtLkRh ZhSwTAFtKAE9TN1hoecuI7lFLhYyye39smugn63S+tFyBCJF8g5ZRgdfWYSH6NzVaDuR uySZ/flRjlWlBhbf3kM0IV4+8MvGXCimaHxz41ip1FE3UEhyDQDS91uqfEbb1a463Eej T22/N1DrDQ5buUe8R79SKjG6p2uXZ21dVn6a3EUei7Jwtyrsl3HWnu5rCdYxkPUMa5jd dxp9gCy7/VtVYDunUrvVDAzpiPZfRklLZotc+MpJpCZjubqWbtBLcGt0bOUMKqGvUtvy VoEA== X-Gm-Message-State: APjAAAW7wqmh8hzo6b9o3UZMNmW7AhV/T5bmqoRFGAQCkQfDGbTvC1sI Dkiueuc1Ulj01xVtGyETaLw= X-Google-Smtp-Source: APXvYqxAbKZYdb/4axoV04s2z/sq5eEahRVpsV/UdQwkY6Ccr+vfZBE0HNu+jwudVsxucXlNmoW7zw== X-Received: by 2002:a17:906:1f53:: with SMTP id d19mr1675341ejk.12.1556284003082; Fri, 26 Apr 2019 06:06:43 -0700 (PDT) Received: from archlinux-i9 ([2a01:4f9:2b:2b84::2]) by smtp.gmail.com with ESMTPSA id h15sm4548940ejc.78.2019.04.26.06.06.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Apr 2019 06:06:42 -0700 (PDT) Date: Fri, 26 Apr 2019 06:06:40 -0700 From: Nathan Chancellor To: Michael Chan Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: Re: [PATCH net 6/6] bnxt_en: Fix uninitialized variable usage in bnxt_rx_pkt(). Message-ID: <20190426130640.GA17688@archlinux-i9> References: <1556245915-5430-1-git-send-email-michael.chan@broadcom.com> <1556245915-5430-7-git-send-email-michael.chan@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1556245915-5430-7-git-send-email-michael.chan@broadcom.com> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Apr 25, 2019 at 10:31:55PM -0400, Michael Chan wrote: > In bnxt_rx_pkt(), if the driver encounters BD errors, it will recycle > the buffers and jump to the end where the uninitailized variable "len" > is referenced. Fix it by adding a new jump label that will skip > the length update. This is the most correct fix since the length > may not be valid when we get this type of error. > > Fixes: 6a8788f25625 ("bnxt_en: add support for software dynamic interrupt moderation") > Reported-by: Nathan Chancellor > Cc: Nathan Chancellor > Signed-off-by: Michael Chan This indeed fixes the warning, thank you! Link: https://github.com/ClangBuiltLinux/linux/issues/398 Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor > --- > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > index b6cb7b8..52ade13 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > @@ -1625,7 +1625,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, > netdev_warn(bp->dev, "RX buffer error %x\n", rx_err); > bnxt_sched_reset(bp, rxr); > } > - goto next_rx; > + goto next_rx_no_len; > } > > len = le32_to_cpu(rxcmp->rx_cmp_len_flags_type) >> RX_CMP_LEN_SHIFT; > @@ -1706,12 +1706,13 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, > rc = 1; > > next_rx: > - rxr->rx_prod = NEXT_RX(prod); > - rxr->rx_next_cons = NEXT_RX(cons); > - > cpr->rx_packets += 1; > cpr->rx_bytes += len; > > +next_rx_no_len: > + rxr->rx_prod = NEXT_RX(prod); > + rxr->rx_next_cons = NEXT_RX(cons); > + > next_rx_no_prod_no_len: > *raw_cons = tmp_raw_cons; > > -- > 2.5.1 >