Skip to contentSkip to conversation

Fix application of sizeof to pointer

PATCH Superseded [email protected] 2 participants 3 messages Oct 12, 2021 User-mode Linux (UML)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix application of sizeof to pointer

From: David Yang <[email protected]>

The coccinelle check report:
"./arch/um/drivers/virt-pci.c:192:20-26:
ERROR: application of sizeof to pointer"
Using the "sizeof(buf->data)" to fix it.

---
 arch/um/drivers/virt-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/drivers/virt-pci.c +1 -1
index c08066633023..705275c5176c 100644
@@ -189,7 +189,7 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
 	buf = get_cpu_var(um_pci_msg_bufs);
 	data = buf->data;
 
-	memset(data, 0xff, sizeof(data));
+	memset(data, 0xff, sizeof(buf->data));
 
 	switch (size) {
 	case 1:
Signature · 7 lines
2.30.2


_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
#1 lore raw
Quoted 6 lines · On Tue, 2021-10-12 at 11:23 +0800, [email protected] wrote:

From: David Yang <[email protected]>

The coccinelle check report:
"./arch/um/drivers/virt-pci.c:192:20-26:
ERROR: application of sizeof to pointer"
Using the "sizeof(buf->data)" to fix it.

[]

arch/um/drivers/virt-pci.c

Quoted 1 line
arch/um/drivers/virt-pci.c +0 -0

[]

arch/um/drivers/virt-pci.c static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset, · line 192

Quoted 6 lines
arch/um/drivers/virt-pci.c +1 -1
@@ -189,7 +189,7 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
  	buf = get_cpu_var(um_pci_msg_bufs);
  	data = buf->data;
 
-	memset(data, 0xff, sizeof(data));
+	memset(data, 0xff, sizeof(buf->data));

Perhaps change this to:

	memset(buf->data, 0xff, sizeof(buf->data));
	data = buf->data;

but honestly, the indirection to data doesn't make the code much more readable so maybe just remove data altogether.

---
 arch/um/drivers/virt-pci.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
arch/um/drivers/virt-pci.c +6 -7
index c080666330234..75e05ead97b9a 100644
@@ -180,7 +180,6 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
 	};
 	/* buf->data is maximum size - we may only use parts of it */
 	struct um_pci_message_buffer *buf;
-	u8 *data;
 	unsigned long ret = ~0ULL;
 
 	if (!dev)
@@ -189,7 +188,7 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
 	buf = get_cpu_var(um_pci_msg_bufs);
 	data = buf->data;
 
-	memset(data, 0xff, sizeof(data));
+	memset(buf->data, 0xff, sizeof(buf->data));
 
 	switch (size) {
 	case 1:
@@ -204,22 +203,22 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
 		goto out;
 	}
 
-	if (um_pci_send_cmd(dev, &hdr, sizeof(hdr), NULL, 0, data, 8))
+	if (um_pci_send_cmd(dev, &hdr, sizeof(hdr), NULL, 0, buf->data, 8))
 		goto out;
 
 	switch (size) {
 	case 1:
-		ret = data[0];
+		ret = buf->data[0];
 		break;
 	case 2:
-		ret = le16_to_cpup((void *)data);
+		ret = le16_to_cpup((void *)buf->data);
 		break;
 	case 4:
-		ret = le32_to_cpup((void *)data);
+		ret = le32_to_cpup((void *)buf->data);
 		break;
 #ifdef CONFIG_64BIT
 	case 8:
-		ret = le64_to_cpup((void *)data);
+		ret = le64_to_cpup((void *)buf->data);
 		break;
 #endif
 	default:

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

author
#2 lore raw

I'm agree with you. Using the "buf->data" instead is better.

Quoted 69 lines · Joe Perches
Quoted 6 lines · On Tue, 2021-10-12 at 11:23 +0800, [email protected] wrote:

From: David Yang <[email protected]>

The coccinelle check report:
"./arch/um/drivers/virt-pci.c:192:20-26:
ERROR: application of sizeof to pointer"
Using the "sizeof(buf->data)" to fix it.

[]

arch/um/drivers/virt-pci.c

Quoted 1 line
arch/um/drivers/virt-pci.c +0 -0

[]

arch/um/drivers/virt-pci.c static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset, · line 192

Quoted 6 lines
arch/um/drivers/virt-pci.c +1 -1
@@ -189,7 +189,7 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
    buf = get_cpu_var(um_pci_msg_bufs);
    data = buf->data;
 
-   memset(data, 0xff, sizeof(data));
+   memset(data, 0xff, sizeof(buf->data));

Perhaps change this to:

      memset(buf->data, 0xff, sizeof(buf->data));
      data = buf->data;

but honestly, the indirection to data doesn't make the code much more readable so maybe just remove data altogether.

---
 arch/um/drivers/virt-pci.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
arch/um/drivers/virt-pci.c +4 -5
index c080666330234..75e05ead97b9a 100644
@@ -180,7 +180,6 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
      };
      /* buf->data is maximum size - we may only use parts of it */
      struct um_pci_message_buffer *buf;
-     u8 *data;
      unsigned long ret = ~0ULL;
 
      if (!dev)
@@ -189,7 +188,7 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
      buf = get_cpu_var(um_pci_msg_bufs);
      data = buf->data;
 
-     memset(data, 0xff, sizeof(data));
+     memset(buf->data, 0xff, sizeof(buf->data));
 
      switch (size) {
      case 1:
@@ -204,22 +203,22 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
              goto out;
      }
 
-     if (um_pci_send_cmd(dev, &hdr, sizeof(hdr), NULL, 0, data, 8))
+     if (um_pci_send_cmd(dev, &hdr, sizeof(hdr), NULL, 0, buf->data, 8))
              goto out;
 
      switch (size) {
      case 1:
-             ret = data[0];
+             ret = buf->data[0];
              break;
      case 2:
-             ret = le16_to_cpup((void *)data);
+             ret = le16_to_cpup((void *)buf->data);
              break;
      case 4:

arch/um/drivers/virt-pci.c static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset, · line 224

Quoted 10 lines
arch/um/drivers/virt-pci.c +2 -2
-             ret = le32_to_cpup((void *)data);
+             ret = le32_to_cpup((void *)buf->data);
              break;
 #ifdef CONFIG_64BIT
      case 8:
-             ret = le64_to_cpup((void *)data);
+             ret = le64_to_cpup((void *)buf->data);
              break;
 #endif
      default:

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um