Skip to content

Commit 995ddc5

Browse files
David Laightkees
authored andcommitted
fortify: Use C arithmetic not FIELD_xxx() in FORTIFY_REASON defines
FIELD_GET() and FIELD_PREP() are mainly useful for hardware register accesses, but here they are being used for some very simple oprations. This wouldn't matter much, but they contain a lot of compile-time checks (that really aren't needed here) that bloat the expansion of FIELD_GET(GENMASK(7, 1), func) to over 18KB. Even with the 'bloat reduced' FIELD_GET/PREP they are still hundreds of characters. Replace FIELD_GET(BIT(0), r) with ((r) & 1), FIELD_GET(GENMASK(7, 1), r) with (r) >> 1), and (FIELD_PREP(BIT(0), write) | FIELD_PREP(GENMASK(7, 1), func)) with ((func) << 1 | (write)). The generated code is the same, but it makes the .c file less obfuctaced, the .i file much easier to read, and should marginally decrease compilation time. Signed-off-by: David Laight <david.laight.linux@gmail.com> Link: https://patch.msgid.link/20251214125857.3308-1-david.laight.linux@gmail.com Signed-off-by: Kees Cook <kees@kernel.org>
1 parent cc34c66 commit 995ddc5

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

include/linux/fortify-string.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
#ifndef _LINUX_FORTIFY_STRING_H_
33
#define _LINUX_FORTIFY_STRING_H_
44

5-
#include <linux/bitfield.h>
65
#include <linux/bug.h>
76
#include <linux/const.h>
87
#include <linux/limits.h>
98

109
#define __FORTIFY_INLINE extern __always_inline __gnu_inline __overloadable
1110
#define __RENAME(x) __asm__(#x)
1211

13-
#define FORTIFY_REASON_DIR(r) FIELD_GET(BIT(0), r)
14-
#define FORTIFY_REASON_FUNC(r) FIELD_GET(GENMASK(7, 1), r)
15-
#define FORTIFY_REASON(func, write) (FIELD_PREP(BIT(0), write) | \
16-
FIELD_PREP(GENMASK(7, 1), func))
12+
#define FORTIFY_REASON_DIR(r) ((r) & 1)
13+
#define FORTIFY_REASON_FUNC(r) ((r) >> 1)
14+
#define FORTIFY_REASON(func, write) ((func) << 1 | (write))
1715

1816
/* Overridden by KUnit tests. */
1917
#ifndef fortify_panic

0 commit comments

Comments
 (0)