From 9b8ff92e428067ef4028b94b26c585be25e0846d Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Thu, 25 Feb 2016 23:24:27 +0000 Subject: [PATCH] mt7601u: do not free dma_buf when ivp allocation fails If the allocation of ivp fails the error handling attempts to free an uninitialized dma_buf; this data structure just contains garbage on the stack, so the freeing will cause issues when the urb, buf and dma fields are free'd. Fix this by not free'ing the dma_buf if the ivp allocation fails. Signed-off-by: Colin Ian King Reviewed-by: Julian Calaby Signed-off-by: Kalle Valo Signed-off-by: Jakub Kicinski --- mcu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mcu.c b/mcu.c index fbb1986..91c4b34 100644 --- a/mcu.c +++ b/mcu.c @@ -362,7 +362,9 @@ mt7601u_upload_firmware(struct mt7601u_dev *dev, const struct mt76_fw *fw) int i, ret; ivb = kmemdup(fw->ivb, sizeof(fw->ivb), GFP_KERNEL); - if (!ivb || mt7601u_usb_alloc_buf(dev, MCU_FW_URB_SIZE, &dma_buf)) { + if (!ivb) + return -ENOMEM; + if (mt7601u_usb_alloc_buf(dev, MCU_FW_URB_SIZE, &dma_buf)) { ret = -ENOMEM; goto error; }