diff mbox series

[v2] package/mmc-utils: fix build failure due to a warning and -Werror enabled

Message ID 20220918163147.1133842-1-giulio.benetti@benettiengineering.com
State Rejected
Headers show
Series [v2] package/mmc-utils: fix build failure due to a warning and -Werror enabled | expand

Commit Message

Giulio Benetti Sept. 18, 2022, 4:31 p.m. UTC
Add patch to fix warning that is treated like error:
```
In function '__bswap_32',
    inlined from 'do_rpmb_write_block' at mmc_cmds.c:2293:27:
/home/autobuild/autobuild/instance-15/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/bits/byteswap.h:52:10: error: 'cnt' may be used uninitialized [-Werror=maybe-uninitialized]
   52 |   return __builtin_bswap32 (__bsx);
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~
mmc_cmds.c: In function 'do_rpmb_write_block':
mmc_cmds.c:2270:22: note: 'cnt' was declared here
 2270 |         unsigned int cnt;
      |                      ^~~
cc1: all warnings being treated as errors
```
Patch is pending upstream:
https://patchwork.kernel.org/project/linux-mmc/patch/20220918161751.1132590-1-giulio.benetti@benettiengineering.com/

Fixes:
http://autobuild.buildroot.net/results/18c4fce5416e5d1ccd95900ccef87d4c045a361e/

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
V1->V2:
* change local patch approach after feedback in linux-mmc mailing list
---
 ...ils-fix-warning-on-uninitialized-cnt.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/mmc-utils/0002-mmc-utils-fix-warning-on-uninitialized-cnt.patch
diff mbox series

Patch

diff --git a/package/mmc-utils/0002-mmc-utils-fix-warning-on-uninitialized-cnt.patch b/package/mmc-utils/0002-mmc-utils-fix-warning-on-uninitialized-cnt.patch
new file mode 100644
index 0000000000..04ba6ea399
--- /dev/null
+++ b/package/mmc-utils/0002-mmc-utils-fix-warning-on-uninitialized-cnt.patch
@@ -0,0 +1,47 @@ 
+From 639a80658dfe4302617a3fd22cbae4714efd40b6 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Sun, 18 Sep 2022 14:10:29 +0200
+Subject: [PATCH] mmc-utils: fix warning on uninitialized 'cnt'
+
+When building following warning shows up:
+```
+In function '__bswap_32',
+    inlined from 'do_rpmb_write_block' at mmc_cmds.c:2293:27:
+/home/autobuild/autobuild/instance-15/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/bits/byteswap.h:52:10: error: 'cnt' may be used uninitialized [-Werror=maybe-uninitialized]
+   52 |   return __builtin_bswap32 (__bsx);
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~
+mmc_cmds.c: In function 'do_rpmb_write_block':
+mmc_cmds.c:2270:22: note: 'cnt' was declared here
+2270 |         unsigned int cnt;
+      |                      ^~~
+cc1: all warnings being treated as errors
+```
+This is due to function rpmb_read_counter() that doesn't set its
+argument 'unsigned int *cnt' in all return points. So let's set
+*cnt to 0 in the return point that misses to initialize it.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+[Upstream status: https://patchwork.kernel.org/project/linux-mmc/patch/20220918161751.1132590-1-giulio.benetti@benettiengineering.com/]
+---
+ mmc_cmds.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/mmc_cmds.c b/mmc_cmds.c
+index 12b7802..4d203ef 100644
+--- a/mmc_cmds.c
++++ b/mmc_cmds.c
+@@ -2238,8 +2238,10 @@ int rpmb_read_counter(int dev_fd, unsigned int *cnt)
+ 	}
+ 
+ 	/* Check RPMB response */
+-	if (frame_out.result != 0)
++	if (frame_out.result != 0) {
++		*cnt = 0;
+ 		return be16toh(frame_out.result);
++	}
+ 
+ 	*cnt = be32toh(frame_out.write_counter);
+ 
+-- 
+2.34.1
+