mei: remove one-element arrays
Subsystems (2)
cover mei: remove one-element arrays
1. Remove one-element arrays from hw.h
2. Adjust to preferred method of getting size of structure from memory allocation and movement. sizeof(*var) instead of sizeof(struct some_struct)
Tomas Winkler (6):
mei: hbm: use sizeof of variable instead of struct type
mei: ioctl: use sizeof of variable instead of struct type
mei: bus: use sizeof of variable instead of struct type
mei: client: use sizeof of variable instead of struct type
mei: hw: use sizeof of variable instead of struct type
mei: hw: don't use one element arrays
drivers/misc/mei/bus-fixup.c | 23 ++++++----- drivers/misc/mei/bus.c | 2 +- drivers/misc/mei/client.c | 8 ++-- drivers/misc/mei/hbm.c | 74 ++++++++++++++++-------------------- drivers/misc/mei/hw-me.c | 5 +-- drivers/misc/mei/hw-txe.c | 5 +-- drivers/misc/mei/hw.h | 8 ++-- drivers/misc/mei/main.c | 6 +-- 8 files changed, 59 insertions(+), 72 deletions(-)
Signature · 1 line
2.25.4
PATCH 1/6 mei: hbm: use sizeof of variable instead of struct type
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
--- drivers/misc/mei/hbm.c | 74 ++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 42 deletions(-)
drivers/misc/mei/hbm.c +32 -42
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ #include <linux/export.h>
@@ -257,22 +257,21 @@ int mei_hbm_start_wait(struct mei_device *dev)int mei_hbm_start_req (struct mei_device *dev) {struct mei_msg_hdr mei_hdr; -struct hbm_host_version_request start_req; -const size_t len =sizeof (struct hbm_host_version_request ); +struct hbm_host_version_request req;int ret;mei_hbm_reset (dev); -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req));/* host start message */ -memset (&start_req,0 , len); - start_req.hbm_cmd =HOST_START_REQ_CMD ; - start_req.host_version.major_version =HBM_MAJOR_VERSION ; - start_req.host_version.minor_version =HBM_MINOR_VERSION ; +memset (&req,0 ,sizeof (req)); + req.hbm_cmd =HOST_START_REQ_CMD ; + req.host_version.major_version =HBM_MAJOR_VERSION ; + req.host_version.minor_version =HBM_MINOR_VERSION ; dev->hbm_state =MEI_HBM_IDLE ; - ret =mei_hbm_write_message (dev, &mei_hdr, &start_req); + ret =mei_hbm_write_message (dev, &mei_hdr, &req);if (ret) {dev_err (dev->dev,"version message write failed: ret = %d\n" , ret);
@@ -295,13 +294,12 @@ static int mei_hbm_dma_setup_req(struct mei_device *dev) {struct mei_msg_hdr mei_hdr;struct hbm_dma_setup_request req; -const size_t len =sizeof (struct hbm_dma_setup_request );unsigned int i;int ret; -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&req,0 , len); +memset (&req,0 ,sizeof (req)); req.hbm_cmd =MEI_HBM_DMA_SETUP_REQ_CMD ;for (i =0 ; i <DMA_DSCR_NUM ; i++) {phys_addr_t paddr;
@@ -337,21 +335,19 @@ static int mei_hbm_dma_setup_req(struct mei_device *dev)static int mei_hbm_enum_clients_req (struct mei_device *dev) {struct mei_msg_hdr mei_hdr; -struct hbm_host_enum_request enum_req; -const size_t len =sizeof (struct hbm_host_enum_request ); +struct hbm_host_enum_request req;int ret;/* enumerate clients */ -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&enum_req,0 , len); - enum_req.hbm_cmd =HOST_ENUM_REQ_CMD ; - enum_req.flags |= dev->hbm_f_dc_supported ? -MEI_HBM_ENUM_F_ALLOW_ADD :0 ; - enum_req.flags |= dev->hbm_f_ie_supported ? +memset (&req,0 ,sizeof (req)); + req.hbm_cmd =HOST_ENUM_REQ_CMD ; + req.flags |= dev->hbm_f_dc_supported ?MEI_HBM_ENUM_F_ALLOW_ADD :0 ; + req.flags |= dev->hbm_f_ie_supported ?MEI_HBM_ENUM_F_IMMEDIATE_ENUM :0 ; - ret =mei_hbm_write_message (dev, &mei_hdr, &enum_req); + ret =mei_hbm_write_message (dev, &mei_hdr, &req);if (ret) {dev_err (dev->dev,"enumeration request write failed: ret = %d.\n" , ret);
@@ -380,7 +376,7 @@ static int mei_hbm_me_cl_add(struct mei_device *dev,mei_me_cl_rm_by_uuid (dev, uuid); - me_cl =kzalloc (sizeof (struct mei_me_client ),GFP_KERNEL ); + me_cl =kzalloc (sizeof (*me_cl),GFP_KERNEL );if (!me_cl)return -ENOMEM ;
@@ -408,14 +404,13 @@ static int mei_hbm_add_cl_resp(struct mei_device *dev, u8 addr, u8 status) {struct mei_msg_hdr mei_hdr;struct hbm_add_client_response resp; -const size_t len =sizeof (struct hbm_add_client_response );int ret;dev_dbg (dev->dev,"adding client response\n" ); -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (resp)); -memset (&resp,0 ,sizeof (struct hbm_add_client_response )); +memset (&resp,0 ,sizeof (resp)); resp.hbm_cmd =MEI_HBM_ADD_CLIENT_RES_CMD ; resp.me_addr = addr; resp.status = status;
@@ -469,11 +464,10 @@ int mei_hbm_cl_notify_req(struct mei_device *dev,struct mei_msg_hdr mei_hdr;struct hbm_notification_request req; -const size_t len =sizeof (struct hbm_notification_request );int ret; -mei_hbm_hdr (&mei_hdr, len); -mei_hbm_cl_hdr (cl,MEI_HBM_NOTIFY_REQ_CMD , &req, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); +mei_hbm_cl_hdr (cl,MEI_HBM_NOTIFY_REQ_CMD , &req,sizeof (req)); req.start = start;
@@ -580,8 +574,7 @@ static void mei_hbm_cl_notify(struct mei_device *dev,static int mei_hbm_prop_req (struct mei_device *dev,unsigned long start_idx) {struct mei_msg_hdr mei_hdr; -struct hbm_props_request prop_req; -const size_t len =sizeof (struct hbm_props_request ); +struct hbm_props_request req;unsigned long addr;int ret;
@@ -591,18 +584,17 @@ static int mei_hbm_prop_req(struct mei_device *dev, unsigned long start_idx)if (addr ==MEI_CLIENTS_MAX ) { dev->hbm_state =MEI_HBM_STARTED ;mei_host_client_init (dev); -return 0 ; } -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&prop_req,0 ,sizeof (struct hbm_props_request )); +memset (&req,0 ,sizeof (req)); - prop_req.hbm_cmd =HOST_CLIENT_PROPERTIES_REQ_CMD ; - prop_req.me_addr = addr; + req.hbm_cmd =HOST_CLIENT_PROPERTIES_REQ_CMD ; + req.me_addr = addr; - ret =mei_hbm_write_message (dev, &mei_hdr, &prop_req); + ret =mei_hbm_write_message (dev, &mei_hdr, &req);if (ret) {dev_err (dev->dev,"properties request write failed: ret = %d\n" , ret);
@@ -628,15 +620,14 @@ int mei_hbm_pg(struct mei_device *dev, u8 pg_cmd) {struct mei_msg_hdr mei_hdr;struct hbm_power_gate req; -const size_t len =sizeof (struct hbm_power_gate );int ret;if (!dev->hbm_f_pg_supported)return -EOPNOTSUPP ; -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&req,0 , len); +memset (&req,0 ,sizeof (req)); req.hbm_cmd = pg_cmd; ret =mei_hbm_write_message (dev, &mei_hdr, &req);
@@ -657,11 +648,10 @@ static int mei_hbm_stop_req(struct mei_device *dev) {struct mei_msg_hdr mei_hdr;struct hbm_host_stop_request req; -const size_t len =sizeof (struct hbm_host_stop_request ); -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&req,0 , len); +memset (&req,0 ,sizeof (req)); req.hbm_cmd =HOST_STOP_REQ_CMD ; req.reason =DRIVER_STOP_REQUEST ;
Signature · 1 line
2.25.4
Greg Kroah-Hartman
maintainerRe: [char-misc-next 1/6] mei: hbm: use sizeof of variable instead of struct type
Quoted 8 lines · Tomas Winkler
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>--- drivers/misc/mei/hbm.c | 74 ++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 42 deletions(-)
This doesn't apply to my tree as I've applied Gustavo's patch. Should I revert that first?
thanks,
greg k-h
Re: [char-misc-next 1/6] mei: hbm: use sizeof of variable instead of struct type
Quoted 4 lines · Greg Kroah-Hartman
Quoted 3 lines · Tomas Winkler
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Quoted 9 lines
Quoted 5 lines
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>--- drivers/misc/mei/hbm.c | 74 ++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 42 deletions(-)This doesn't apply to my tree as I've applied Gustavo's patch. Should I revert that first?
Yep; this series doesn't take into account my patch. I'm OK with reverting it, so we can apply this series.
Thanks
--
Gustavo
Greg Kroah-Hartman
maintainerRe: [char-misc-next 1/6] mei: hbm: use sizeof of variable instead of struct type
Quoted 13 lines · Gustavo A. R. Silva
Quoted 10 lines · Greg Kroah-Hartman
Quoted 8 lines · Tomas Winkler
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>--- drivers/misc/mei/hbm.c | 74 ++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 42 deletions(-)
Quoted 6 lines
Quoted 3 lines
This doesn't apply to my tree as I've applied Gustavo's patch. Should I revert that first?
Yep; this series doesn't take into account my patch. I'm OK with reverting it, so we can apply this series.
Ok, will do, thanks!
greg k-h
Re: [char-misc-next 1/6] mei: hbm: use sizeof of variable instead of struct type
In reply to Tomas WinklerQuoted 5 lines · Tomas Winkler
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Thanks
--
Gustavo
Quoted 198 lines
--- drivers/misc/mei/hbm.c | 74 ++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 42 deletions(-)drivers/misc/mei/hbm.c +32
-42@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ #include <linux/export.h> @@ -257,22 +257,21 @@ int mei_hbm_start_wait(struct mei_device *dev)int mei_hbm_start_req (struct mei_device *dev) {struct mei_msg_hdr mei_hdr; -struct hbm_host_version_request start_req; -const size_t len =sizeof (struct hbm_host_version_request ); +struct hbm_host_version_request req;int ret;mei_hbm_reset (dev); -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req));/* host start message */ -memset (&start_req,0 , len); - start_req.hbm_cmd =HOST_START_REQ_CMD ; - start_req.host_version.major_version =HBM_MAJOR_VERSION ; - start_req.host_version.minor_version =HBM_MINOR_VERSION ; +memset (&req,0 ,sizeof (req)); + req.hbm_cmd =HOST_START_REQ_CMD ; + req.host_version.major_version =HBM_MAJOR_VERSION ; + req.host_version.minor_version =HBM_MINOR_VERSION ; dev->hbm_state =MEI_HBM_IDLE ; - ret =mei_hbm_write_message (dev, &mei_hdr, &start_req); + ret =mei_hbm_write_message (dev, &mei_hdr, &req);if (ret) {dev_err (dev->dev,"version message write failed: ret = %d\n" , ret);@@ -295,13 +294,12 @@ static int mei_hbm_dma_setup_req(struct mei_device *dev) {struct mei_msg_hdr mei_hdr;struct hbm_dma_setup_request req; -const size_t len =sizeof (struct hbm_dma_setup_request );unsigned int i;int ret; -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&req,0 , len); +memset (&req,0 ,sizeof (req)); req.hbm_cmd =MEI_HBM_DMA_SETUP_REQ_CMD ;for (i =0 ; i <DMA_DSCR_NUM ; i++) {phys_addr_t paddr;@@ -337,21 +335,19 @@ static int mei_hbm_dma_setup_req(struct mei_device *dev)static int mei_hbm_enum_clients_req (struct mei_device *dev) {struct mei_msg_hdr mei_hdr; -struct hbm_host_enum_request enum_req; -const size_t len =sizeof (struct hbm_host_enum_request ); +struct hbm_host_enum_request req;int ret;/* enumerate clients */ -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&enum_req,0 , len); - enum_req.hbm_cmd =HOST_ENUM_REQ_CMD ; - enum_req.flags |= dev->hbm_f_dc_supported ? -MEI_HBM_ENUM_F_ALLOW_ADD :0 ; - enum_req.flags |= dev->hbm_f_ie_supported ? +memset (&req,0 ,sizeof (req)); + req.hbm_cmd =HOST_ENUM_REQ_CMD ; + req.flags |= dev->hbm_f_dc_supported ?MEI_HBM_ENUM_F_ALLOW_ADD :0 ; + req.flags |= dev->hbm_f_ie_supported ?MEI_HBM_ENUM_F_IMMEDIATE_ENUM :0 ; - ret =mei_hbm_write_message (dev, &mei_hdr, &enum_req); + ret =mei_hbm_write_message (dev, &mei_hdr, &req);if (ret) {dev_err (dev->dev,"enumeration request write failed: ret = %d.\n" , ret);@@ -380,7 +376,7 @@ static int mei_hbm_me_cl_add(struct mei_device *dev,mei_me_cl_rm_by_uuid (dev, uuid); - me_cl =kzalloc (sizeof (struct mei_me_client ),GFP_KERNEL ); + me_cl =kzalloc (sizeof (*me_cl),GFP_KERNEL );if (!me_cl)return -ENOMEM ;@@ -408,14 +404,13 @@ static int mei_hbm_add_cl_resp(struct mei_device *dev, u8 addr, u8 status) {struct mei_msg_hdr mei_hdr;struct hbm_add_client_response resp; -const size_t len =sizeof (struct hbm_add_client_response );int ret;dev_dbg (dev->dev,"adding client response\n" ); -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (resp)); -memset (&resp,0 ,sizeof (struct hbm_add_client_response )); +memset (&resp,0 ,sizeof (resp)); resp.hbm_cmd =MEI_HBM_ADD_CLIENT_RES_CMD ; resp.me_addr = addr; resp.status = status;@@ -469,11 +464,10 @@ int mei_hbm_cl_notify_req(struct mei_device *dev,struct mei_msg_hdr mei_hdr;struct hbm_notification_request req; -const size_t len =sizeof (struct hbm_notification_request );int ret; -mei_hbm_hdr (&mei_hdr, len); -mei_hbm_cl_hdr (cl,MEI_HBM_NOTIFY_REQ_CMD , &req, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); +mei_hbm_cl_hdr (cl,MEI_HBM_NOTIFY_REQ_CMD , &req,sizeof (req)); req.start = start;@@ -580,8 +574,7 @@ static void mei_hbm_cl_notify(struct mei_device *dev,static int mei_hbm_prop_req (struct mei_device *dev,unsigned long start_idx) {struct mei_msg_hdr mei_hdr; -struct hbm_props_request prop_req; -const size_t len =sizeof (struct hbm_props_request ); +struct hbm_props_request req;unsigned long addr;int ret;@@ -591,18 +584,17 @@ static int mei_hbm_prop_req(struct mei_device *dev, unsigned long start_idx)if (addr ==MEI_CLIENTS_MAX ) { dev->hbm_state =MEI_HBM_STARTED ;mei_host_client_init (dev); -return 0 ; } -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&prop_req,0 ,sizeof (struct hbm_props_request )); +memset (&req,0 ,sizeof (req)); - prop_req.hbm_cmd =HOST_CLIENT_PROPERTIES_REQ_CMD ; - prop_req.me_addr = addr; + req.hbm_cmd =HOST_CLIENT_PROPERTIES_REQ_CMD ; + req.me_addr = addr; - ret =mei_hbm_write_message (dev, &mei_hdr, &prop_req); + ret =mei_hbm_write_message (dev, &mei_hdr, &req);if (ret) {dev_err (dev->dev,"properties request write failed: ret = %d\n" , ret);@@ -628,15 +620,14 @@ int mei_hbm_pg(struct mei_device *dev, u8 pg_cmd) {struct mei_msg_hdr mei_hdr;struct hbm_power_gate req; -const size_t len =sizeof (struct hbm_power_gate );int ret;if (!dev->hbm_f_pg_supported)return -EOPNOTSUPP ; -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&req,0 , len); +memset (&req,0 ,sizeof (req)); req.hbm_cmd = pg_cmd; ret =mei_hbm_write_message (dev, &mei_hdr, &req);@@ -657,11 +648,10 @@ static int mei_hbm_stop_req(struct mei_device *dev) {struct mei_msg_hdr mei_hdr;struct hbm_host_stop_request req; -const size_t len =sizeof (struct hbm_host_stop_request ); -mei_hbm_hdr (&mei_hdr, len); +mei_hbm_hdr (&mei_hdr,sizeof (req)); -memset (&req,0 , len); +memset (&req,0 ,sizeof (req)); req.hbm_cmd =HOST_STOP_REQ_CMD ; req.reason =DRIVER_STOP_REQUEST ;
PATCH 2/6 mei: ioctl: use sizeof of variable instead of struct type
In reply to Tomas WinklerUse sizeof(connect_data))) instead of sizeof(struct mei_connect_client_data) when copying data between user space and kernel.
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
--- drivers/misc/mei/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/misc/mei/main.c +3 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2018, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -476,7 +476,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)case IOCTL_MEI_CONNECT_CLIENT :dev_dbg (dev->dev,": IOCTL_MEI_CONNECT_CLIENT.\n" );if (copy_from_user (&connect_data, (char __user *)data, -sizeof (struct mei_connect_client_data ))) { +sizeof (connect_data))) {dev_dbg (dev->dev,"failed to copy data from userland\n" ); rets = -EFAULT ; goto out;
@@ -488,7 +488,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)/* if all is ok, copying the data back to user. */ if (copy_to_user ((char __user *)data, &connect_data, -sizeof (struct mei_connect_client_data ))) { +sizeof (connect_data))) {dev_dbg (dev->dev,"failed to copy data to userland\n" ); rets = -EFAULT ; goto out;
Signature · 1 line
2.25.4
Re: [char-misc-next 2/6] mei: ioctl: use sizeof of variable instead of struct type
Quoted 9 lines · Tomas Winkler
Use
sizeof(connect_data))) instead ofsizeof(struct mei_connect_client_data)when copying data between user space and kernel.There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Thanks
--
Gustavo
Quoted 35 lines
--- drivers/misc/mei/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/misc/mei/main.c +3
-3@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2018, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -476,7 +476,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)case IOCTL_MEI_CONNECT_CLIENT :dev_dbg (dev->dev,": IOCTL_MEI_CONNECT_CLIENT.\n" );if (copy_from_user (&connect_data, (char __user *)data, -sizeof (struct mei_connect_client_data ))) { +sizeof (connect_data))) {dev_dbg (dev->dev,"failed to copy data from userland\n" ); rets = -EFAULT ; goto out;@@ -488,7 +488,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)/* if all is ok, copying the data back to user. */ if (copy_to_user ((char __user *)data, &connect_data, -sizeof (struct mei_connect_client_data ))) { +sizeof (connect_data))) {dev_dbg (dev->dev,"failed to copy data to userland\n" ); rets = -EFAULT ; goto out;
PATCH 3/6 mei: bus: use sizeof of variable instead of struct type
In reply to Tomas WinklerThere is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
--- drivers/misc/mei/bus-fixup.c | 23 +++++++++++------------ drivers/misc/mei/bus.c | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-)
drivers/misc/mei/bus-fixup.c +11 -12
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2013-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2013-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -159,17 +159,17 @@ static int mei_osver(struct mei_cl_device *cldev)static int mei_fwver (struct mei_cl_device *cldev) {char buf[MKHI_FWVER_BUF_LEN ]; -struct mkhi_msg *req; +struct mkhi_msg req; +struct mkhi_msg *rsp;struct mkhi_fw_ver *fwver;int bytes_recv, ret, i;memset (buf,0 ,sizeof (buf)); - req = (struct mkhi_msg *)buf; - req->hdr.group_id =MKHI_GEN_GROUP_ID ; - req->hdr.command =MKHI_GEN_GET_FW_VERSION_CMD ; + req.hdr.group_id =MKHI_GEN_GROUP_ID ; + req.hdr.command =MKHI_GEN_GET_FW_VERSION_CMD ; - ret =__mei_cl_send (cldev->cl, buf,sizeof (struct mkhi_msg_hdr ), + ret =__mei_cl_send (cldev->cl, (u8 *)&req,sizeof (req),MEI_CL_IO_TX_BLOCKING );if (ret <0 ) {dev_err (&cldev->dev,"Could not send ReqFWVersion cmd\n" );
@@ -188,7 +188,8 @@ static int mei_fwver(struct mei_cl_device *cldev)return -EIO ; } - fwver = (struct mkhi_fw_ver *)req->data; + rsp = (struct mkhi_msg *)buf; + fwver = (struct mkhi_fw_ver *)rsp->data;memset (cldev->bus->fw_ver,0 ,sizeof (cldev->bus->fw_ver));for (i =0 ; i <MEI_MAX_FW_VER_BLOCKS ; i++) {if ((size_t )bytes_recv <MKHI_FWVER_LEN (i +1 ))
@@ -329,16 +330,14 @@ static int mei_nfc_if_version(struct mei_cl *cl,WARN_ON (mutex_is_locked (&bus->device_lock)); - ret =__mei_cl_send (cl, (u8 *)&cmd,sizeof (struct mei_nfc_cmd ), -MEI_CL_IO_TX_BLOCKING ); + ret =__mei_cl_send (cl, (u8 *)&cmd,sizeof (cmd),MEI_CL_IO_TX_BLOCKING );if (ret <0 ) {dev_err (bus->dev,"Could not send IF version cmd\n" );return ret; }/* to be sure on the stack we alloc memory */ - if_version_length =sizeof (struct mei_nfc_reply ) + -sizeof (struct mei_nfc_if_version ); + if_version_length =sizeof (*reply) +sizeof (*ver); reply =kzalloc (if_version_length,GFP_KERNEL );if (!reply)
@@ -352,7 +351,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, goto err; } -memcpy (ver, reply->data,sizeof (struct mei_nfc_if_version )); +memcpy (ver, reply->data,sizeof (*ver));dev_info (bus->dev,"NFC MEI VERSION: IVN 0x%x Vendor ID 0x%x Type 0x%x\n" , ver->fw_ivn, ver->vendor_id, ver->radio_type);
drivers/misc/mei/bus.c +1 -1
@@ -931,7 +931,7 @@ static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus,struct mei_cl_device *cldev;struct mei_cl *cl; - cldev =kzalloc (sizeof (struct mei_cl_device ),GFP_KERNEL ); + cldev =kzalloc (sizeof (*cldev),GFP_KERNEL );if (!cldev)return NULL ;
Signature · 1 line
2.25.4
Re: [char-misc-next 3/6] mei: bus: use sizeof of variable instead of struct type
Quoted 5 lines · Tomas Winkler
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Thanks
--
Gustavo
Quoted 92 lines
--- drivers/misc/mei/bus-fixup.c | 23 +++++++++++------------ drivers/misc/mei/bus.c | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-)drivers/misc/mei/bus-fixup.c +11
-12@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2013-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2013-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -159,17 +159,17 @@ static int mei_osver(struct mei_cl_device *cldev)static int mei_fwver (struct mei_cl_device *cldev) {char buf[MKHI_FWVER_BUF_LEN ]; -struct mkhi_msg *req; +struct mkhi_msg req; +struct mkhi_msg *rsp;struct mkhi_fw_ver *fwver;int bytes_recv, ret, i;memset (buf,0 ,sizeof (buf)); - req = (struct mkhi_msg *)buf; - req->hdr.group_id =MKHI_GEN_GROUP_ID ; - req->hdr.command =MKHI_GEN_GET_FW_VERSION_CMD ; + req.hdr.group_id =MKHI_GEN_GROUP_ID ; + req.hdr.command =MKHI_GEN_GET_FW_VERSION_CMD ; - ret =__mei_cl_send (cldev->cl, buf,sizeof (struct mkhi_msg_hdr ), + ret =__mei_cl_send (cldev->cl, (u8 *)&req,sizeof (req),MEI_CL_IO_TX_BLOCKING );if (ret <0 ) {dev_err (&cldev->dev,"Could not send ReqFWVersion cmd\n" );@@ -188,7 +188,8 @@ static int mei_fwver(struct mei_cl_device *cldev)return -EIO ; } - fwver = (struct mkhi_fw_ver *)req->data; + rsp = (struct mkhi_msg *)buf; + fwver = (struct mkhi_fw_ver *)rsp->data;memset (cldev->bus->fw_ver,0 ,sizeof (cldev->bus->fw_ver));for (i =0 ; i <MEI_MAX_FW_VER_BLOCKS ; i++) {if ((size_t )bytes_recv <MKHI_FWVER_LEN (i +1 ))@@ -329,16 +330,14 @@ static int mei_nfc_if_version(struct mei_cl *cl,WARN_ON (mutex_is_locked (&bus->device_lock)); - ret =__mei_cl_send (cl, (u8 *)&cmd,sizeof (struct mei_nfc_cmd ), -MEI_CL_IO_TX_BLOCKING ); + ret =__mei_cl_send (cl, (u8 *)&cmd,sizeof (cmd),MEI_CL_IO_TX_BLOCKING );if (ret <0 ) {dev_err (bus->dev,"Could not send IF version cmd\n" );return ret; }/* to be sure on the stack we alloc memory */ - if_version_length =sizeof (struct mei_nfc_reply ) + -sizeof (struct mei_nfc_if_version ); + if_version_length =sizeof (*reply) +sizeof (*ver); reply =kzalloc (if_version_length,GFP_KERNEL );if (!reply)@@ -352,7 +351,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, goto err; } -memcpy (ver, reply->data,sizeof (struct mei_nfc_if_version )); +memcpy (ver, reply->data,sizeof (*ver));dev_info (bus->dev,"NFC MEI VERSION: IVN 0x%x Vendor ID 0x%x Type 0x%x\n" , ver->fw_ivn, ver->vendor_id, ver->radio_type);drivers/misc/mei/bus.c +1
-1@@ -931,7 +931,7 @@ static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus,struct mei_cl_device *cldev;struct mei_cl *cl; - cldev =kzalloc (sizeof (struct mei_cl_device ),GFP_KERNEL ); + cldev =kzalloc (sizeof (*cldev),GFP_KERNEL );if (!cldev)return NULL ;
PATCH 4/6 mei: client: use sizeof of variable instead of struct type
In reply to Tomas WinklerThere is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
--- drivers/misc/mei/client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/mei/client.c +4 -4
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -369,7 +369,7 @@ static struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl, {struct mei_cl_cb *cb; - cb =kzalloc (sizeof (struct mei_cl_cb ),GFP_KERNEL ); + cb =kzalloc (sizeof (*cb),GFP_KERNEL );if (!cb)return NULL ;
@@ -552,7 +552,7 @@ int mei_cl_flush_queues(struct mei_cl *cl, const struct file *fp)*/ static void mei_cl_init (struct mei_cl *cl,struct mei_device *dev) { -memset (cl,0 ,sizeof (struct mei_cl )); +memset (cl,0 ,sizeof (*cl));init_waitqueue_head (&cl->wait);init_waitqueue_head (&cl->rx_wait);init_waitqueue_head (&cl->tx_wait);
@@ -575,7 +575,7 @@ struct mei_cl *mei_cl_allocate(struct mei_device *dev) {struct mei_cl *cl; - cl =kmalloc (sizeof (struct mei_cl ),GFP_KERNEL ); + cl =kmalloc (sizeof (*cl),GFP_KERNEL );if (!cl)return NULL ;
Signature · 1 line
2.25.4
Re: [char-misc-next 4/6] mei: client: use sizeof of variable instead of struct type
Quoted 5 lines · Tomas Winkler
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Thanks
--
Gustavo
Quoted 44 lines
--- drivers/misc/mei/client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/misc/mei/client.c +4
-4@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -369,7 +369,7 @@ static struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl, {struct mei_cl_cb *cb; - cb =kzalloc (sizeof (struct mei_cl_cb ),GFP_KERNEL ); + cb =kzalloc (sizeof (*cb),GFP_KERNEL );if (!cb)return NULL ;@@ -552,7 +552,7 @@ int mei_cl_flush_queues(struct mei_cl *cl, const struct file *fp)*/ static void mei_cl_init (struct mei_cl *cl,struct mei_device *dev) { -memset (cl,0 ,sizeof (struct mei_cl )); +memset (cl,0 ,sizeof (*cl));init_waitqueue_head (&cl->wait);init_waitqueue_head (&cl->rx_wait);init_waitqueue_head (&cl->tx_wait);@@ -575,7 +575,7 @@ struct mei_cl *mei_cl_allocate(struct mei_device *dev) {struct mei_cl *cl; - cl =kmalloc (sizeof (struct mei_cl ),GFP_KERNEL ); + cl =kmalloc (sizeof (*cl),GFP_KERNEL );if (!cl)return NULL ;
PATCH 5/6 mei: hw: use sizeof of variable instead of struct type
In reply to Tomas WinklerUse sizeof(*dev) + sizeof(*hw) instead of sizeof(struct mei_device) + sizeof(struct mei_me_hw)
There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
--- drivers/misc/mei/hw-me.c | 5 ++--- drivers/misc/mei/hw-txe.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/misc/mei/hw-me.c +2 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -1600,8 +1600,7 @@ struct mei_device *mei_me_dev_init(struct device *parent,struct mei_me_hw *hw;int i; - dev =devm_kzalloc (parent,sizeof (struct mei_device ) + -sizeof (struct mei_me_hw ),GFP_KERNEL ); + dev =devm_kzalloc (parent,sizeof (*dev) +sizeof (*hw),GFP_KERNEL );if (!dev)return NULL ;
drivers/misc/mei/hw-txe.c +2 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2013-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2013-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -1201,8 +1201,7 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev)struct mei_device *dev;struct mei_txe_hw *hw; - dev =devm_kzalloc (&pdev->dev,sizeof (struct mei_device ) + -sizeof (struct mei_txe_hw ),GFP_KERNEL ); + dev =devm_kzalloc (&pdev->dev,sizeof (*dev) +sizeof (*hw),GFP_KERNEL );if (!dev)return NULL ;
Signature · 1 line
2.25.4
Re: [char-misc-next 5/6] mei: hw: use sizeof of variable instead of struct type
Quoted 8 lines · Tomas Winkler
Use
sizeof(*dev)+sizeof(*hw)instead ofsizeof(struct mei_device)+sizeof(struct mei_me_hw)There is a possibility of bug when variable type has changed but corresponding struct passed to the sizeof has not.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Thanks
--
Gustavo
Quoted 50 lines
--- drivers/misc/mei/hw-me.c | 5 ++--- drivers/misc/mei/hw-txe.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)drivers/misc/mei/hw-me.c +2
-3@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -1600,8 +1600,7 @@ struct mei_device *mei_me_dev_init(struct device *parent,struct mei_me_hw *hw;int i; - dev =devm_kzalloc (parent,sizeof (struct mei_device ) + -sizeof (struct mei_me_hw ),GFP_KERNEL ); + dev =devm_kzalloc (parent,sizeof (*dev) +sizeof (*hw),GFP_KERNEL );if (!dev)return NULL ;drivers/misc/mei/hw-txe.c +2
-3@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2013-2019, Intel Corporation. All rights reserved. +* Copyright (c) 2013-2020, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -1201,8 +1201,7 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev)struct mei_device *dev;struct mei_txe_hw *hw; - dev =devm_kzalloc (&pdev->dev,sizeof (struct mei_device ) + -sizeof (struct mei_txe_hw ),GFP_KERNEL ); + dev =devm_kzalloc (&pdev->dev,sizeof (*dev) +sizeof (*hw),GFP_KERNEL );if (!dev)return NULL ;
PATCH 6/6 mei: hw: don't use one element arrays
In reply to Tomas WinklerReplace the single element arrays with a simple value type u8 reserved, even thought is is not used for dynamically sized trailing elements it confuses the effort of replacing one-element arrays with flexible arrays for that purpose.
--- drivers/misc/mei/hw.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/mei/hw.h +4 -4
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (c) 2003-2018, Intel Corporation. All rights reserved +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -319,7 +319,7 @@ struct hbm_props_response {u8 hbm_cmd;u8 me_addr;u8 status; -u8 reserved[1 ]; +u8 reserved;struct mei_client_properties client_properties; } __packed;
@@ -352,7 +352,7 @@ struct hbm_add_client_response {u8 hbm_cmd;u8 me_addr;u8 status; -u8 reserved[1 ]; +u8 reserved; } __packed;/**
@@ -461,7 +461,7 @@ struct hbm_notification {u8 hbm_cmd;u8 me_addr;u8 host_addr; -u8 reserved[1 ]; +u8 reserved; } __packed;/**
Signature · 1 line
2.25.4
Re: [char-misc-next 6/6] mei: hw: don't use one element arrays
Quoted 8 lines · Tomas Winkler
Replace the single element arrays with a simple value type u8 reserved, even thought is is not used for dynamically sized trailing elements it confuses the effort of replacing one-element arrays with flexible arrays for that purpose.
Cc Gustavo A. R. Silva <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Thanks
--
Gustavo
Quoted 44 lines
--- drivers/misc/mei/hw.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/misc/mei/hw.h +4
-4@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (c) 2003-2018, Intel Corporation. All rights reserved +* Copyright (c) 2003-2020, Intel Corporation. All rights reserved * Intel Management Engine Interface (Intel MEI) Linux driver */ @@ -319,7 +319,7 @@ struct hbm_props_response {u8 hbm_cmd;u8 me_addr;u8 status; -u8 reserved[1 ]; +u8 reserved;struct mei_client_properties client_properties; } __packed;@@ -352,7 +352,7 @@ struct hbm_add_client_response {u8 hbm_cmd;u8 me_addr;u8 status; -u8 reserved[1 ]; +u8 reserved; } __packed;/** @@ -461,7 +461,7 @@ struct hbm_notification {u8 hbm_cmd;u8 me_addr;u8 host_addr; -u8 reserved[1 ]; +u8 reserved; } __packed;/**