staging: rtl8712: uninitialized memory in read_bbreg_hdl() (22c971db) · Commits · 戴 / test

Colin King reported a bug in read_bbreg_hdl(): memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz); The problem is that "val" is uninitialized. This code is obviously not useful, but so far as I can tell "pcmd->cmdcode" is never GEN_CMD_CODE(_Read_BBREG) so it's not harmful either. For now the easiest fix is to just call r8712_free_cmd_obj() and return. Fixes: ("staging: r8712u: Add the new driver to the mainline kernel") Reported-by:

Colin Ian King <colin.king@canonical.com> Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/rtl8712/rtl8712_cmd.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -147,17 +147,9 @@ static u8 write_macreg_hdl(struct _adapter padapter, u8 pbuf)

		static u8 read_bbreg_hdl(struct _adapter padapter, u8 pbuf)
		{
		u32 val;
		void (pcmd_callback)(struct _adapter dev, struct cmd_obj *pcmd);
		struct cmd_obj pcmd = (struct cmd_obj )pbuf;

		if (pcmd->rsp && pcmd->rspsz > 0)
		memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz);
		pcmd_callback = cmd_callback[pcmd->cmdcode].callback;
		if (!pcmd_callback)
		r8712_free_cmd_obj(pcmd);
		else
		pcmd_callback(padapter, pcmd);
		return H2C_SUCCESS;
		}

drivers/staging/rtl8712/rtl8712_cmd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ enum rtl8712_h2c_cmd {
		static struct _cmd_callback cmd_callback[] = {
		{GEN_CMD_CODE(_Read_MACREG), NULL}, /0/
		{GEN_CMD_CODE(_Write_MACREG), NULL},
		{GEN_CMD_CODE(_Read_BBREG), &r8712_getbbrfreg_cmdrsp_callback},
		{GEN_CMD_CODE(_Read_BBREG), NULL},
		{GEN_CMD_CODE(_Write_BBREG), NULL},
		{GEN_CMD_CODE(_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback},
		{GEN_CMD_CODE(_Write_RFREG), NULL}, /5/

Admin message