Skip to contentSkip to conversation

build: Enable -Wstringop-overflow and -D_FORTIFY_SOURCE=3

PATCH Applied Luiz Augusto von Dentz 3 participants 4 messages Feb 4, 2025 Bluetooth drivers

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH v2 1/2 build: Enable -Wstringop-overflow and -D_FORTIFY_SOURCE=3

From: Luiz Augusto von Dentz <[email protected]>

This enables -Wstringop-overflow compiler warnings:

'Warn for calls to string manipulation functions such as "memcpy" and "strcpy" that are determined to overflow the destination buffer.'

Along with -D_FORTIFY_SOURCE=3 so the errors like the following can be captured:

In function ‘read’,
inlined from ‘serial_read_callback’ at emulator/serial.c:90:8:
/usr/include/bits/unistd.h:32:10: error: ‘__read_alias’ specified size between 18446744073709490177 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
32 | return __glibc_fortify (read, __nbytes, sizeof (char),

      |          ^~~~~~~~~~~~~~~
---
 acinclude.m4 | 2 ++
 1 file changed, 2 insertions(+)
acinclude.m4 +2 -0
index 4b73a5bfc38f..9f2dc302e7bc 100644
@@ -61,9 +61,11 @@ AC_DEFUN([COMPILER_FLAGS], [
 		with_cflags="$with_cflags -Wcast-align"
 		with_cflags="$with_cflags -Wswitch-enum"
 		with_cflags="$with_cflags -Wformat -Wformat-security"
+		with_cflags="$with_cflags -Wstringop-overflow"
 		with_cflags="$with_cflags -DG_DISABLE_DEPRECATED"
 		with_cflags="$with_cflags -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_28"
 		with_cflags="$with_cflags -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
+		with_cflags="$with_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"
 	fi
 	AC_SUBST([WARNING_CFLAGS], $with_cflags)
 ])
Signature · 1 line
2.48.1
author maintainer
#1 lore raw

PATCH v2 2/2 emulator: Fix Werror=stringop-overflow

From: Luiz Augusto von Dentz <[email protected]>

This fixes the following build errors caused by buf being used as a static from tracking progress of a packet when it is not necessary since pkt_data exists for the same reason:

/usr/include/bits/unistd.h:32:10: error: ‘__read_alias’ specified size between 18446744073709490177 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
32 | return __glibc_fortify (read, __nbytes, sizeof (char),

      |          ^~~~~~~~~~~~~~~

emulator/serial.c: In function ‘serial_read_callback’:
emulator/serial.c:78:24: note: destination object allocated here
78 | static uint8_t buf[4096];
| ^~~
/usr/include/bits/unistd-decl.h:29:16: note: in a call to function ‘__read_alias’ declared with attribute ‘access (write_only, 2, 3)’
29 | extern ssize_t __REDIRECT_FORTIFY (__read_alias, (int __fd, void *__buf,

      |                ^~~~~~~~~~~~~~~~~~
---
 emulator/serial.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
emulator/serial.c +3 -4
index b74556b13547..f8062ae5eac3 100644
@@ -75,7 +75,7 @@ static void serial_write_callback(const struct iovec *iov, int iovlen,
 static void serial_read_callback(int fd, uint32_t events, void *user_data)
 {
 	struct serial *serial = user_data;
-	static uint8_t buf[4096];
+	uint8_t buf[4096];
 	uint8_t *ptr = buf;
 	ssize_t len;
 	uint16_t count;
@@ -87,8 +87,7 @@ static void serial_read_callback(int fd, uint32_t events, void *user_data)
 	}
 
 again:
-	len = read(serial->fd, buf + serial->pkt_offset,
-			sizeof(buf) - serial->pkt_offset);
+	len = read(serial->fd, buf, sizeof(buf));
 	if (len < 0) {
 		if (errno == EAGAIN)
 			goto again;
@@ -98,7 +97,7 @@ again:
 	if (!serial->btdev)
 		return;
 
-	count = serial->pkt_offset + len;
+	count = len;
 
 	while (count > 0) {
 		hci_command_hdr *cmd_hdr;
Signature · 1 line
2.48.1
#2 lore raw
In reply to Luiz Augusto von Dentz

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=930572

---Test result---

Test Summary:

CheckPatch                    PENDING   0.22 seconds
GitLint                       PENDING   0.17 seconds
BuildEll                      PASS      20.48 seconds
BluezMake                     PASS      1493.53 seconds
MakeCheck                     PASS      12.73 seconds
MakeDistcheck                 PASS      156.64 seconds
CheckValgrind                 PASS      212.23 seconds
CheckSmatch                   PASS      281.84 seconds
bluezmakeextell               PASS      97.57 seconds
IncrementalBuild              PENDING   0.27 seconds
ScanBuild                     PASS      847.66 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:

---
Regards,
Linux Bluetooth

#3 lore raw
In reply to Luiz Augusto von Dentz
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:

Hello:

This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:

Quoted 8 lines · On Tue, 4 Feb 2025 15:19:47 -0500 you wrote:

From: Luiz Augusto von Dentz <[email protected]>

This enables -Wstringop-overflow compiler warnings:

'Warn for calls to string manipulation functions such as "memcpy" and "strcpy" that are determined to overflow the destination buffer.'

[...]

Here is the summary with links:
- [BlueZ,v2,1/2] build: Enable -Wstringop-overflow and -D_FORTIFY_SOURCE=3

    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=26ef5a951e81
  - [BlueZ,v2,2/2] emulator: Fix Werror=stringop-overflow
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=de2773b659d0

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html