Skip to content

Commit 78acd4c

Browse files
nathanchancetorvalds
authored andcommitted
usb: cdns3: Don't use priv_dev uninitialized in cdns3_gadget_ep_enable()
Clang warns: drivers/usb/cdns3/cdns3-gadget.c:2290:11: error: variable 'priv_dev' is uninitialized when used here [-Werror,-Wuninitialized] dev_dbg(priv_dev->dev, "usbss: invalid parameters\n"); ^~~~~~~~ include/linux/dev_printk.h:155:18: note: expanded from macro 'dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~ include/linux/dynamic_debug.h:167:7: note: expanded from macro 'dynamic_dev_dbg' dev, fmt, ##__VA_ARGS__) ^~~ include/linux/dynamic_debug.h:152:56: note: expanded from macro '_dynamic_func_call' __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__) ^~~~~~~~~~~ include/linux/dynamic_debug.h:134:15: note: expanded from macro '__dynamic_func_call' func(&id, ##__VA_ARGS__); \ ^~~~~~~~~~~ drivers/usb/cdns3/cdns3-gadget.c:2278:31: note: initialize the variable 'priv_dev' to silence this warning struct cdns3_device *priv_dev; ^ = NULL 1 error generated. The priv_dev assignment was moved below the if statement to avoid potentially dereferencing ep before it was checked but priv_dev is used in the dev_dbg() call. To fix this, move the priv_dev and comp_desc assignments back to their original spot and hoist the ep check above those assignments with a call to pr_debug() instead of dev_dbg(). Fixes: c3ffc9c ("usb: cdns3: change place of 'priv_ep' assignment in cdns3_gadget_ep_dequeue(), cdns3_gadget_ep_enable()") Link: ClangBuiltLinux#1680 Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 9e2e5ea commit 78acd4c

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/usb/cdns3/cdns3-gadget.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,16 +2284,20 @@ static int cdns3_gadget_ep_enable(struct usb_ep *ep,
22842284
int ret = 0;
22852285
int val;
22862286

2287+
if (!ep) {
2288+
pr_debug("usbss: ep not configured?\n");
2289+
return -EINVAL;
2290+
}
2291+
22872292
priv_ep = ep_to_cdns3_ep(ep);
2293+
priv_dev = priv_ep->cdns3_dev;
2294+
comp_desc = priv_ep->endpoint.comp_desc;
22882295

2289-
if (!ep || !desc || desc->bDescriptorType != USB_DT_ENDPOINT) {
2296+
if (!desc || desc->bDescriptorType != USB_DT_ENDPOINT) {
22902297
dev_dbg(priv_dev->dev, "usbss: invalid parameters\n");
22912298
return -EINVAL;
22922299
}
22932300

2294-
comp_desc = priv_ep->endpoint.comp_desc;
2295-
priv_dev = priv_ep->cdns3_dev;
2296-
22972301
if (!desc->wMaxPacketSize) {
22982302
dev_err(priv_dev->dev, "usbss: missing wMaxPacketSize\n");
22992303
return -EINVAL;

0 commit comments

Comments
 (0)