hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "mei: Avoid the use of one-element arrays" 

This reverts commit 3c3b7ddef7, as it
turns out Tomas made a better series of patches for this same issue.

Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2020-07-23 19:29:25 +02:00
parent 20f7151d63
commit e24ca92599
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/mei/hbm.c
View File

@ -408,14 +408,14 @@ static int mei_hbm_add_cl_resp(struct mei_device *dev, u8 addr, u8 status)
{ {
struct mei_msg_hdr mei_hdr; struct mei_msg_hdr mei_hdr;
struct hbm_add_client_response resp; struct hbm_add_client_response resp;
const size_t len = sizeof(resp); const size_t len = sizeof(struct hbm_add_client_response);
int ret; int ret;
dev_dbg(dev->dev, "adding client response\n"); dev_dbg(dev->dev, "adding client response\n");
mei_hbm_hdr(&mei_hdr, len); mei_hbm_hdr(&mei_hdr, len);
memset(&resp, 0, len); memset(&resp, 0, sizeof(struct hbm_add_client_response));
resp.hbm_cmd = MEI_HBM_ADD_CLIENT_RES_CMD; resp.hbm_cmd = MEI_HBM_ADD_CLIENT_RES_CMD;
resp.me_addr = addr; resp.me_addr = addr;
resp.status = status; resp.status = status;

6
drivers/misc/mei/hw.h
View File

@ -346,13 +346,13 @@ struct hbm_add_client_request {
* @hbm_cmd: bus message command header * @hbm_cmd: bus message command header
* @me_addr: address of the client in ME * @me_addr: address of the client in ME
* @status: if HBMS_SUCCESS then the client can now accept connections. * @status: if HBMS_SUCCESS then the client can now accept connections.
* @reserved: reserved for alignment. * @reserved: reserved
*/ */
struct hbm_add_client_response { struct hbm_add_client_response {
u8 hbm_cmd; u8 hbm_cmd;
u8 me_addr; u8 me_addr;
u8 status; u8 status;
u8 reserved; u8 reserved[1];
} __packed; } __packed;
/** /**
@ -461,7 +461,7 @@ struct hbm_notification {
u8 hbm_cmd; u8 hbm_cmd;
u8 me_addr; u8 me_addr;
u8 host_addr; u8 host_addr;
u8 reserved; u8 reserved[1];
} __packed; } __packed;
/** /**