| Message ID | 20210311104445.7811-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9858af27e69247c5d04c3b093190a93ca365f33d |
| Headers | show |
| Series | [next] usbip: Fix incorrect double assignment to udc->ud.tcp_rx | expand |
On 3/11/21 3:44 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently udc->ud.tcp_rx is being assigned twice, the second assignment > is incorrect, it should be to udc->ud.tcp_tx instead of rx. Fix this. > > Addresses-Coverity: ("Unused value") > Fixes: 46613c9dfa96 ("usbip: fix vudc usbip_sockfd_store races leading to gpf") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/usb/usbip/vudc_sysfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/usbip/vudc_sysfs.c b/drivers/usb/usbip/vudc_sysfs.c > index a3ec39fc6177..7383a543c6d1 100644 > --- a/drivers/usb/usbip/vudc_sysfs.c > +++ b/drivers/usb/usbip/vudc_sysfs.c > @@ -174,7 +174,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, > > udc->ud.tcp_socket = socket; > udc->ud.tcp_rx = tcp_rx; > - udc->ud.tcp_rx = tcp_tx; > + udc->ud.tcp_tx = tcp_tx; > udc->ud.status = SDEV_ST_USED; > > spin_unlock_irq(&udc->ud.lock); > Thank you for finding and fixing this. This is my bad. Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
On 3/11/21 7:16 AM, Shuah Khan wrote: > On 3/11/21 3:44 AM, Colin King wrote: >> From: Colin Ian King <colin.king@canonical.com> >> >> Currently udc->ud.tcp_rx is being assigned twice, the second assignment >> is incorrect, it should be to udc->ud.tcp_tx instead of rx. Fix this. >> >> Addresses-Coverity: ("Unused value") >> Fixes: 46613c9dfa96 ("usbip: fix vudc usbip_sockfd_store races leading >> to gpf") >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> drivers/usb/usbip/vudc_sysfs.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/usb/usbip/vudc_sysfs.c >> b/drivers/usb/usbip/vudc_sysfs.c >> index a3ec39fc6177..7383a543c6d1 100644 >> --- a/drivers/usb/usbip/vudc_sysfs.c >> +++ b/drivers/usb/usbip/vudc_sysfs.c >> @@ -174,7 +174,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, >> udc->ud.tcp_socket = socket; >> udc->ud.tcp_rx = tcp_rx; >> - udc->ud.tcp_rx = tcp_tx; >> + udc->ud.tcp_tx = tcp_tx; >> udc->ud.status = SDEV_ST_USED; >> spin_unlock_irq(&udc->ud.lock); >> > > Thank you for finding and fixing this. This is my bad. > > Acked-by: Shuah Khan <skhan@linuxfoundation.org> > Applies to stables as well since the 46613c9dfa96 is marked for stables. thanks, -- Shuah
diff --git a/drivers/usb/usbip/vudc_sysfs.c b/drivers/usb/usbip/vudc_sysfs.c index a3ec39fc6177..7383a543c6d1 100644 --- a/drivers/usb/usbip/vudc_sysfs.c +++ b/drivers/usb/usbip/vudc_sysfs.c @@ -174,7 +174,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, udc->ud.tcp_socket = socket; udc->ud.tcp_rx = tcp_rx; - udc->ud.tcp_rx = tcp_tx; + udc->ud.tcp_tx = tcp_tx; udc->ud.status = SDEV_ST_USED; spin_unlock_irq(&udc->ud.lock);