usbnet: fix memory leak in error case
Subsystems (5)
Oliver Neukum
maintainerPATCH v2 1/1 usbnet: fix memory leak in error case
usbnet_write_cmd_async() mixed up which buffers
need to be freed in which error case.
v2: add Fixes tag
Fixes 877bd862f32b8 ("usbnet: introduce usbnet 3 command helpers")
Signed-off-by Oliver Neukum <[email protected]>
--- drivers/net/usb/usbnet.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/usb/usbnet.c +13 -6
@@ -2137,10 +2137,10 @@ static void usbnet_async_cmd_cb(struct urb *urb)int usbnet_write_cmd_async (struct usbnet *dev,u8 cmd,u8 reqtype,u16 value,u16 index,const void *data,u16 size) { -struct usb_ctrlrequest *req =NULL ; +struct usb_ctrlrequest *req;struct urb *urb;int err = -ENOMEM ; -void *buf =NULL ; +void *buf; netdev_dbg(dev->net, "usbnet_write_cmd cmd=0x%02x reqtype=%02x" " value=0x%04x index=0x%04x size=%d\n",
@@ -2155,7 +2155,7 @@ int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype,if (!buf) {netdev_err (dev->net,"Error allocating buffer" " in %s!\n" , __func__); - goto fail_free; + goto fail_free_urb; } }
@@ -2179,14 +2179,21 @@ int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype,if (err <0 ) {netdev_err (dev->net,"Error submitting the control" " message: status=%d\n" , err); - goto fail_free; + goto fail_free_all; }return 0 ; +fail_free_all: +kfree (req); fail_free_buf:kfree (buf); -fail_free: -kfree (req); +/* +* avoid a double free +* needed because the flag can be set only +* after filling the URB +*/ + urb->transfer_flags =0 ; +fail_free_urb:usb_free_urb (urb); fail:return err;
Signature · 1 line
2.35.3
Jakub Kicinski
maintainerQuoted 17 lines · On Tue, 28 Jun 2022 10:31:28 +0200 Oliver Neukum wrote:
drivers/net/usb/usbnet.c +2
-2-void *buf =NULL ; +void *buf; netdev_dbg(dev->net, "usbnet_write_cmd cmd=0x%02x reqtype=%02x" " value=0x%04x index=0x%04x size=%d\n",@@ -2155,7 +2155,7 @@ int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype,if (!buf) {netdev_err (dev->net,"Error allocating buffer" " in %s!\n" , __func__); - goto fail_free; + goto fail_free_urb; } }@@ -2179,14 +2179,21 @@ int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype,if (err <0 ) { netdev_err(dev->net, "Error submitting the control"
drivers/net/usb/usbnet.c int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype, · line 2189
Quoted 10 lines
drivers/net/usb/usbnet.c +3
-1" message: status=%d\n", err); - goto fail_free; + goto fail_free_all; }return 0 ; +fail_free_all: +kfree (req); fail_free_buf:kfree (buf);
Seems like the buf can be uninitialized now if data was NULL
Oliver Neukum
maintainerQuoted 2 lines · Jakub Kicinski
Seems like the buf can be uninitialized now if data was NULL
Thank you, are right, sending out v3
Regards
Oliver