|
@@ -29,26 +29,6 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-/*
|
|
|
|
- * Warn developers about inappropriate array_index_nospec() usage.
|
|
|
|
- *
|
|
|
|
- * Even if the CPU speculates past the WARN_ONCE branch, the
|
|
|
|
- * sign bit of @index is taken into account when generating the
|
|
|
|
- * mask.
|
|
|
|
- *
|
|
|
|
- * This warning is compiled out when the compiler can infer that
|
|
|
|
- * @index and @size are less than LONG_MAX.
|
|
|
|
- */
|
|
|
|
-#define array_index_mask_nospec_check(index, size) \
|
|
|
|
-({ \
|
|
|
|
- if (WARN_ONCE(index > LONG_MAX || size > LONG_MAX, \
|
|
|
|
- "array_index_nospec() limited to range of [0, LONG_MAX]\n")) \
|
|
|
|
- _mask = 0; \
|
|
|
|
- else \
|
|
|
|
- _mask = array_index_mask_nospec(index, size); \
|
|
|
|
- _mask; \
|
|
|
|
-})
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* array_index_nospec - sanitize an array index after a bounds check
|
|
* array_index_nospec - sanitize an array index after a bounds check
|
|
*
|
|
*
|
|
@@ -67,7 +47,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
|
|
({ \
|
|
({ \
|
|
typeof(index) _i = (index); \
|
|
typeof(index) _i = (index); \
|
|
typeof(size) _s = (size); \
|
|
typeof(size) _s = (size); \
|
|
- unsigned long _mask = array_index_mask_nospec_check(_i, _s); \
|
|
|
|
|
|
+ unsigned long _mask = array_index_mask_nospec(_i, _s); \
|
|
\
|
|
\
|
|
BUILD_BUG_ON(sizeof(_i) > sizeof(long)); \
|
|
BUILD_BUG_ON(sizeof(_i) > sizeof(long)); \
|
|
BUILD_BUG_ON(sizeof(_s) > sizeof(long)); \
|
|
BUILD_BUG_ON(sizeof(_s) > sizeof(long)); \
|