| Message ID | 1480760857-4549-1-git-send-email-bianpan2016@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 259010c509b6f28b3b851ae45238cf526f52e185 |
| Delegated to: | Kalle Valo |
| Headers | show |
Pan Bian <bianpan2016@163.com> wrote: > Function lbs_cmd_802_11_sleep_params() always return 0, even if the call > to lbs_cmd_with_response() fails. In this case, the parameter @sp will > keep uninitialized. Because the return value is 0, its caller (say > lbs_sleepparams_read()) will not detect the error, and will copy the > uninitialized stack memory to user sapce, resulting in stack information > leak. To avoid the bug, this patch returns variable ret (which takes > the return value of lbs_cmd_with_response()) instead of 0. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188451 > > Signed-off-by: Pan Bian <bianpan2016@163.com> The prefix should be "libertas:", I'll fix that.
Pan Bian <bianpan2016@163.com> wrote: > Function lbs_cmd_802_11_sleep_params() always return 0, even if the call > to lbs_cmd_with_response() fails. In this case, the parameter @sp will > keep uninitialized. Because the return value is 0, its caller (say > lbs_sleepparams_read()) will not detect the error, and will copy the > uninitialized stack memory to user sapce, resulting in stack information > leak. To avoid the bug, this patch returns variable ret (which takes > the return value of lbs_cmd_with_response()) instead of 0. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188451 > > Signed-off-by: Pan Bian <bianpan2016@163.com> Patch applied to wireless-drivers-next.git, thanks. 259010c509b6 libertas: fix improper return value
diff --git a/drivers/net/wireless/marvell/libertas/cmd.c b/drivers/net/wireless/marvell/libertas/cmd.c index 301170c..033ff88 100644 --- a/drivers/net/wireless/marvell/libertas/cmd.c +++ b/drivers/net/wireless/marvell/libertas/cmd.c @@ -305,7 +305,7 @@ int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action, } lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); - return 0; + return ret; } static int lbs_wait_for_ds_awake(struct lbs_private *priv)
Function lbs_cmd_802_11_sleep_params() always return 0, even if the call to lbs_cmd_with_response() fails. In this case, the parameter @sp will keep uninitialized. Because the return value is 0, its caller (say lbs_sleepparams_read()) will not detect the error, and will copy the uninitialized stack memory to user sapce, resulting in stack information leak. To avoid the bug, this patch returns variable ret (which takes the return value of lbs_cmd_with_response()) instead of 0. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188451 Signed-off-by: Pan Bian <bianpan2016@163.com> --- drivers/net/wireless/marvell/libertas/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)