| Message ID | 20220724202452.61846-1-ammar.faizi@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d578e0af3a003736f6c440188b156483d451b329 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: wil6210: debugfs: fix uninitialized variable use in `wil_write_file_wmi()` | expand |
On Mon, Jul 25, 2022 at 03:26:18AM +0700, Ammar Faizi wrote: > Commit 7a4836560a61 changes simple_write_to_buffer() with memdup_user() > but it forgets to change the value to be returned that came from > simple_write_to_buffer() call. It results in the following warning: > > warning: variable 'rc' is uninitialized when used here [-Wuninitialized] > return rc; > ^~ > > Remove rc variable and just return the passed in length if the > memdup_user() succeeds. > > Cc: Dan Carpenter <dan.carpenter@oracle.com> > Reported-by: kernel test robot <lkp@intel.com> > Fixes: 7a4836560a6198d245d5732e26f94898b12eb760 ("wifi: wil6210: debugfs: fix info leak in wil_write_file_wmi()") > Fixes: ff974e4083341383d3dd4079e52ed30f57f376f0 ("wil6210: debugfs interface to send raw WMI command") > Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org> Oops. Sorry! Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> regards, dan carpenter
Ammar Faizi <ammarfaizi2@gnuweeb.org> wrote: > Commit 7a4836560a61 changes simple_write_to_buffer() with memdup_user() > but it forgets to change the value to be returned that came from > simple_write_to_buffer() call. It results in the following warning: > > warning: variable 'rc' is uninitialized when used here [-Wuninitialized] > return rc; > ^~ > > Remove rc variable and just return the passed in length if the > memdup_user() succeeds. > > Cc: Dan Carpenter <dan.carpenter@oracle.com> > Reported-by: kernel test robot <lkp@intel.com> > Fixes: 7a4836560a6198d245d5732e26f94898b12eb760 ("wifi: wil6210: debugfs: fix info leak in wil_write_file_wmi()") > Fixes: ff974e4083341383d3dd4079e52ed30f57f376f0 ("wil6210: debugfs interface to send raw WMI command") > Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org> > Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. d578e0af3a00 wifi: wil6210: debugfs: fix uninitialized variable use in `wil_write_file_wmi()`
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index fe84362718de..04d1aa0e2d35 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c @@ -1010,7 +1010,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, void *cmd; int cmdlen = len - sizeof(struct wmi_cmd_hdr); u16 cmdid; - int rc, rc1; + int rc1; if (cmdlen < 0 || *ppos != 0) return -EINVAL; @@ -1027,7 +1027,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, wil_info(wil, "0x%04x[%d] -> %d\n", cmdid, cmdlen, rc1); - return rc; + return len; } static const struct file_operations fops_wmi = {
Commit 7a4836560a61 changes simple_write_to_buffer() with memdup_user() but it forgets to change the value to be returned that came from simple_write_to_buffer() call. It results in the following warning: warning: variable 'rc' is uninitialized when used here [-Wuninitialized] return rc; ^~ Remove rc variable and just return the passed in length if the memdup_user() succeeds. Cc: Dan Carpenter <dan.carpenter@oracle.com> Reported-by: kernel test robot <lkp@intel.com> Fixes: 7a4836560a6198d245d5732e26f94898b12eb760 ("wifi: wil6210: debugfs: fix info leak in wil_write_file_wmi()") Fixes: ff974e4083341383d3dd4079e52ed30f57f376f0 ("wil6210: debugfs interface to send raw WMI command") Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org> --- drivers/net/wireless/ath/wil6210/debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 086f67ba21ede199307e78476353bda9ffef982c