raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-15 22:41:38 +00:00
Code Issues Projects Releases Wiki Activity

bpf: Avoid uninitialized value in BPF_CORE_READ_BITFIELD

Browse Source 
[Changes from V1:
 - Use a default branch in the switch statement to initialize `val'.]

GCC warns that `val' may be used uninitialized in the
BPF_CRE_READ_BITFIELD macro, defined in bpf_core_read.h as:

	[...]
	unsigned long long val;						      \
	[...]								      \
	switch (__CORE_RELO(s, field, BYTE_SIZE)) {			      \
	case 1: val = *(const unsigned char *)p; break;			      \
	case 2: val = *(const unsigned short *)p; break;		      \
	case 4: val = *(const unsigned int *)p; break;			      \
	case 8: val = *(const unsigned long long *)p; break;		      \
        }       							      \
	[...]
	val;								      \
	}								      \

This patch adds a default entry in the switch statement that sets
`val' to zero in order to avoid the warning, and random values to be
used in case __builtin_preserve_field_info returns unexpected values
for BPF_FIELD_BYTE_SIZE.

Tested in bpf-next master.
No regressions.

Signed-off-by: Jose E. Marchesi <jose.marchesi@oracle.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240508101313.16662-1-jose.marchesi@oracle.com
This commit is contained in:
Jose E. Marchesi
2024-05-08 12:13:13 +02:00
committed by Andrii Nakryiko
parent 911edc69c8
commit 009367099e
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/lib/bpf/bpf_core_read.h
View File

@@ -104,6 +104,7 @@ enum bpf_enum_value_kind {
case 2: val = *(const unsigned short *)p; break; \ case 2: val = *(const unsigned short *)p; break; \
case 4: val = *(const unsigned int *)p; break; \ case 4: val = *(const unsigned int *)p; break; \
case 8: val = *(const unsigned long long *)p; break; \ case 8: val = *(const unsigned long long *)p; break; \
default: val = 0; break; \
} \ } \
val <<= __CORE_RELO(s, field, LSHIFT_U64); \ val <<= __CORE_RELO(s, field, LSHIFT_U64); \
if (__CORE_RELO(s, field, SIGNED)) \ if (__CORE_RELO(s, field, SIGNED)) \