From: Nathan Chancellor <nathan@kernel.org>
To: Robert Hancock <robert.hancock@calian.com>
Cc: linux-usb@vger.kernel.org, balbi@kernel.org,
gregkh@linuxfoundation.org, michal.simek@xilinx.com,
manish.narani@xilinx.com, sean.anderson@seco.com,
robh+dt@kernel.org, devicetree@vger.kernel.org,
piyush.mehta@xilinx.com, stable@vger.kernel.org
Subject: Re: [PATCH] usb: dwc3: xilinx: fix uninitialized return value
Date: Sat, 29 Jan 2022 13:55:42 -0700 [thread overview]
Message-ID: <YfWpznEA95bH1Bvg@dev-arch.archlinux-ax161> (raw)
In-Reply-To: <20220127221500.177021-1-robert.hancock@calian.com>
On Thu, Jan 27, 2022 at 04:15:00PM -0600, Robert Hancock wrote:
> A previous patch to skip part of the initialization when a USB3 PHY was
> not present could result in the return value being uninitialized in that
> case, causing spurious probe failures. Initialize ret to 0 to avoid this.
>
> Fixes: 9678f3361afc ("usb: dwc3: xilinx: Skip resets and USB3 register settings for USB2.0 mode")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
This resolves a clang warning that is now in mainline:
$ make -sj"$(nproc)" ARCH=arm64 LLVM=1 allmodconfig drivers/usb/dwc3/dwc3-xilinx.o
drivers/usb/dwc3/dwc3-xilinx.c:122:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
if (!usb3_phy)
^~~~~~~~~
drivers/usb/dwc3/dwc3-xilinx.c:216:9: note: uninitialized use occurs here
return ret;
^~~
drivers/usb/dwc3/dwc3-xilinx.c:122:2: note: remove the 'if' if its condition is always false
if (!usb3_phy)
^~~~~~~~~~~~~~
drivers/usb/dwc3/dwc3-xilinx.c:102:11: note: initialize the variable 'ret' to silence this warning
int ret;
^
= 0
1 error generated.
It might be worth moving the initialization into the if statement
if (!usb3_phy) {
ret = 0;
goto skip_usb3_phy;
}
as that will avoid hiding warnings of this nature if someone forgets to
set ret on an error path but that is ultimately up to the maintainer.
> ---
> drivers/usb/dwc3/dwc3-xilinx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-xilinx.c b/drivers/usb/dwc3/dwc3-xilinx.c
> index e14ac15e24c3..a6f3a9b38789 100644
> --- a/drivers/usb/dwc3/dwc3-xilinx.c
> +++ b/drivers/usb/dwc3/dwc3-xilinx.c
> @@ -99,7 +99,7 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data)
> struct device *dev = priv_data->dev;
> struct reset_control *crst, *hibrst, *apbrst;
> struct phy *usb3_phy;
> - int ret;
> + int ret = 0;
> u32 reg;
>
> usb3_phy = devm_phy_optional_get(dev, "usb3-phy");
> --
> 2.31.1
>
>
prev parent reply other threads:[~2022-01-29 20:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 22:15 [PATCH] usb: dwc3: xilinx: fix uninitialized return value Robert Hancock
2022-01-29 20:55 ` Nathan Chancellor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YfWpznEA95bH1Bvg@dev-arch.archlinux-ax161 \
--to=nathan@kernel.org \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=manish.narani@xilinx.com \
--cc=michal.simek@xilinx.com \
--cc=piyush.mehta@xilinx.com \
--cc=robert.hancock@calian.com \
--cc=robh+dt@kernel.org \
--cc=sean.anderson@seco.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).