Commit 00247cbf authored by Kees Cook's avatar Kees Cook
Browse files

refcount: Remove unused __signed_wrap function annotations 

With CONFIG_UBSAN_INTEGER_WRAP being replaced by Overflow Behavior
Types, remove the __signed_wrap function annotation as it is already
unused, and any future work here will use OBT annotations instead.

Link: https://patch.msgid.link/20260331163725.2765789-1-kees@kernel.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent a96ef584

include/linux/compiler_types.h

+1 −8
Original line number Diff line number Diff line
@@ -432,18 +432,11 @@ struct ftrace_likely_data { 
#define at_least

#endif



/* Do not trap wrapping arithmetic within an annotated function. */

#ifdef CONFIG_UBSAN_INTEGER_WRAP

# define __signed_wrap __attribute__((no_sanitize("signed-integer-overflow")))

#else

# define __signed_wrap

#endif



/* Section for code which can't be instrumented at all */

#define __noinstr_section(section)					\

	noinline notrace __attribute((__section__(section)))		\

	__no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage \

	__no_sanitize_memory __signed_wrap

	__no_sanitize_memory



#define noinstr __noinstr_section(".noinstr.text")

include/linux/refcount.h

+5 −5
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static inline unsigned int refcount_read(const refcount_t *r) 
	return atomic_read(&r->refs);

}



static inline __must_check __signed_wrap

static inline __must_check

bool __refcount_add_not_zero(int i, refcount_t *r, int *oldp)

{

	int old = refcount_read(r);
@@ -212,7 +212,7 @@ static inline __must_check bool refcount_add_not_zero(int i, refcount_t *r) 
	return __refcount_add_not_zero(i, r, NULL);

}



static inline __must_check __signed_wrap

static inline __must_check

bool __refcount_add_not_zero_limited_acquire(int i, refcount_t *r, int *oldp,

					     int limit)

{
@@ -244,7 +244,7 @@ __refcount_inc_not_zero_limited_acquire(refcount_t *r, int *oldp, int limit) 
	return __refcount_add_not_zero_limited_acquire(1, r, oldp, limit);

}



static inline __must_check __signed_wrap

static inline __must_check

bool __refcount_add_not_zero_acquire(int i, refcount_t *r, int *oldp)

{

	return __refcount_add_not_zero_limited_acquire(i, r, oldp, INT_MAX);
@@ -277,7 +277,7 @@ static inline __must_check bool refcount_add_not_zero_acquire(int i, refcount_t 
	return __refcount_add_not_zero_acquire(i, r, NULL);

}



static inline __signed_wrap

static inline

void __refcount_add(int i, refcount_t *r, int *oldp)

{

	int old = atomic_fetch_add_relaxed(i, &r->refs);
@@ -383,7 +383,7 @@ static inline void refcount_inc(refcount_t *r) 
	__refcount_inc(r, NULL);

}



static inline __must_check __signed_wrap

static inline __must_check

bool __refcount_sub_and_test(int i, refcount_t *r, int *oldp)

{

	int old = atomic_fetch_sub_release(i, &r->refs);