renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 04:03:58 +08:00
Code

carl9170: fix memory leak issue in async cmd macro wrappers

Browse Source 
This patch continues where the previous commit:
	"carl9170: fix async command buffer leak"
left off.

Similar to carl9170_reboot/carl9170_powersave, the
carl9170_async_regwrite* macros would leak the
temporary command buffer, if __carl9170_exec_cmd
fails to upload the command to the device.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Christian Lamparter 2010-10-16 20:47:50 +02:00 committed by John W. Linville
parent 5f4e6b2d3c
commit 3d2f2cd066
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/net/wireless/ath/carl9170/cmd.h
View File

@ -116,8 +116,9 @@ __regwrite_out : \
} while (0); } while (0);
#define carl9170_async_get_buf() \ #define carl9170_async_regwrite_get_buf() \
do { \ do { \
__nreg = 0; \
__cmd = carl9170_cmd_buf(__carl, CARL9170_CMD_WREG_ASYNC, \ __cmd = carl9170_cmd_buf(__carl, CARL9170_CMD_WREG_ASYNC, \
CARL9170_MAX_CMD_PAYLOAD_LEN); \ CARL9170_MAX_CMD_PAYLOAD_LEN); \
if (__cmd == NULL) { \ if (__cmd == NULL) { \
@ -128,38 +129,42 @@ do { \
#define carl9170_async_regwrite_begin(carl) \ #define carl9170_async_regwrite_begin(carl) \
do { \ do { \
int __nreg = 0, __err = 0; \
struct ar9170 *__carl = carl; \ struct ar9170 *__carl = carl; \
struct carl9170_cmd *__cmd; \ struct carl9170_cmd *__cmd; \
carl9170_async_get_buf(); \ unsigned int __nreg; \
int __err = 0; \
carl9170_async_regwrite_get_buf(); \
#define carl9170_async_regwrite_flush() \
do { \
if (__cmd == NULL || __nreg == 0) \
break; \
\
if (IS_ACCEPTING_CMD(__carl) && __nreg) { \
__cmd->hdr.len = 8 * __nreg; \
__err = __carl9170_exec_cmd(__carl, __cmd, true); \
__cmd = NULL; \
break; \
} \
goto __async_regwrite_out; \
} while (0)
#define carl9170_async_regwrite(r, v) do { \ #define carl9170_async_regwrite(r, v) do { \
if (__cmd == NULL) \
carl9170_async_regwrite_get_buf(); \
__cmd->wreg.regs[__nreg].addr = cpu_to_le32(r); \ __cmd->wreg.regs[__nreg].addr = cpu_to_le32(r); \
__cmd->wreg.regs[__nreg].val = cpu_to_le32(v); \ __cmd->wreg.regs[__nreg].val = cpu_to_le32(v); \
__nreg++; \ __nreg++; \
if ((__nreg >= PAYLOAD_MAX/2)) { \ if ((__nreg >= PAYLOAD_MAX / 2)) \
if (IS_ACCEPTING_CMD(__carl)) { \ carl9170_async_regwrite_flush(); \
__cmd->hdr.len = 8 * __nreg; \
__err = __carl9170_exec_cmd(__carl, __cmd, true);\
__cmd = NULL; \
carl9170_async_get_buf(); \
} else { \
goto __async_regwrite_out; \
} \
__nreg = 0; \
if (__err) \
goto __async_regwrite_out; \
} \
} while (0) } while (0)
#define carl9170_async_regwrite_finish() \ #define carl9170_async_regwrite_finish() do { \
__async_regwrite_out : \ __async_regwrite_out : \
if (__err == 0 && __nreg) { \ if (__cmd != NULL && __err == 0) \
__cmd->hdr.len = 8 * __nreg; \ carl9170_async_regwrite_flush(); \
if (IS_ACCEPTING_CMD(__carl)) \ kfree(__cmd); \
__err = __carl9170_exec_cmd(__carl, __cmd, true);\ } while (0) \
__nreg = 0; \
}
#define carl9170_async_regwrite_result() \ #define carl9170_async_regwrite_result() \
__err; \ __err; \