summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHangyu Hua <hbh25y@gmail.com>2022-01-01 01:21:37 +0800
committerMichael Bestas <mkbestas@lineageos.org>2022-11-05 18:58:23 +0200
commitfb6adfb00108e0c84e901106917c2dd3c9e4af9b (patch)
treeffe9cc05dee3a15de153d1c72ccc0c359a8d95a2
parente4a8dd12424ec4659eac4f4f89873af1cbfcbf6b (diff)
UPSTREAM: usb: gadget: don't release an existing dev->buf
commit 89f3594d0de58e8a57d92d497dea9fee3d4b9cda upstream. dev->buf does not need to be released if it already exists before executing dev_config. Bug: 220261709 Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Hangyu Hua <hbh25y@gmail.com> Link: https://lore.kernel.org/r/20211231172138.7993-2-hbh25y@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Change-Id: Id53d6770fbae0a7fcf0fa136157c0ab34fb5da64
-rw-r--r--drivers/usb/gadget/legacy/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index f2b4fdd1f49d..8d144c74792e 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -1851,8 +1851,9 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
spin_lock_irq (&dev->lock);
value = -EINVAL;
if (dev->buf) {
+ spin_unlock_irq(&dev->lock);
kfree(kbuf);
- goto fail;
+ return value;
}
dev->buf = kbuf;