Jason A. Donenfeld
7e3cf0843f
treewide: use get_random_{u8,u16}() when possible, part 1
Rather than truncate a 32-bit value to a 16-bit value or an 8-bit value,
simply use the get_random_{u8,u16}() functions, which are faster than
wasting the additional bytes from a 32-bit value. This was done
mechanically with this coccinelle script:
@@
expression E;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u16;
typedef __be16;
typedef __le16;
typedef u8;
@@
(
- (get_random_u32() & 0xffff)
+ get_random_u16()
|
- (get_random_u32() & 0xff)
+ get_random_u8()
|
- (get_random_u32() % 65536)
+ get_random_u16()
|
- (get_random_u32() % 256)
+ get_random_u8()
|
- (get_random_u32() >> 16)
+ get_random_u16()
|
- (get_random_u32() >> 24)
+ get_random_u8()
|
- (u16)get_random_u32()
+ get_random_u16()
|
- (u8)get_random_u32()
+ get_random_u8()
|
- (__be16)get_random_u32()
+ (__be16)get_random_u16()
|
- (__le16)get_random_u32()
+ (__le16)get_random_u16()
|
- prandom_u32_max(65536)
+ get_random_u16()
|
- prandom_u32_max(256)
+ get_random_u8()
|
- E->inet_id = get_random_u32()
+ E->inet_id = get_random_u16()
)
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u16;
identifier v;
@@
- u16 v = get_random_u32();
+ u16 v = get_random_u16();
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u8;
identifier v;
@@
- u8 v = get_random_u32();
+ u8 v = get_random_u8();
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u16;
u16 v;
@@
- v = get_random_u32();
+ v = get_random_u16();
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u8;
u8 v;
@@
- v = get_random_u32();
+ v = get_random_u8();
// Find a potential literal
@literal_mask@
expression LITERAL;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
position p;
@@
((T)get_random_u32()@p & (LITERAL))
// Examine limits
@script:python add_one@
literal << literal_mask.LITERAL;
RESULT;
@@
value = None
if literal.startswith('0x'):
value = int(literal, 16)
elif literal[0] in '123456789':
value = int(literal, 10)
if value is None:
print("I don't know how to handle %s" % (literal))
cocci.include_match(False)
elif value < 256:
coccinelle.RESULT = cocci.make_ident("get_random_u8")
elif value < 65536:
coccinelle.RESULT = cocci.make_ident("get_random_u16")
else:
print("Skipping large mask of %s" % (literal))
cocci.include_match(False)
// Replace the literal mask with the calculated result.
@plus_one@
expression literal_mask.LITERAL;
position literal_mask.p;
identifier add_one.RESULT;
identifier FUNC;
@@
- (FUNC()@p & (LITERAL))
+ (RESULT() & LITERAL)
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Yury Norov <yury.norov@gmail.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> # for sch_cake
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2022-10-11 17:42:58 -06:00
..
2020-08-10 01:32:59 +09:00
2022-08-26 18:40:14 +08:00
2022-05-09 17:20:37 -07:00
2021-07-08 11:48:20 -07:00
2022-09-30 13:17:39 -06:00
2022-06-15 10:29:10 +02:00
2022-07-17 17:31:39 -07:00
2022-07-29 18:12:34 -07:00
2021-09-08 11:50:26 -07:00
2022-08-07 10:03:24 -07:00
2021-07-08 11:48:20 -07:00
2022-03-08 15:20:21 -08:00
2022-10-11 17:42:55 -06:00
2022-02-13 16:50:06 -08:00
2021-04-14 23:04:44 +10:00
2021-10-19 23:44:30 +08:00
2020-08-10 01:32:59 +09:00
2020-12-29 15:36:49 -08:00
2021-09-24 16:13:35 -07:00
2022-10-03 03:52:58 +09:00
2022-04-26 17:58:51 -04:00
2018-06-12 16:19:22 -07:00
2019-05-24 17:39:02 +02:00
2019-05-24 17:39:02 +02:00
2020-11-18 14:15:17 -06:00
2022-01-20 08:52:55 +02:00
2022-06-01 18:29:06 -07:00
2019-05-30 11:26:32 -07:00
2021-12-13 10:56:09 +01:00
2021-10-01 16:52:48 -04:00
2022-08-02 17:14:47 -06:00
2017-11-02 11:10:55 +01:00
2021-05-06 19:24:12 -07:00
2020-10-16 13:25:14 -06:00
2022-09-26 12:19:12 -07:00
2019-05-21 10:50:45 +02:00
2022-04-26 17:58:51 -04:00
2022-04-26 17:58:51 -04:00
2020-06-11 15:14:53 +02:00
2022-06-16 19:58:21 -07:00
2018-08-16 12:14:42 -07:00
2022-05-19 23:46:10 +02:00
2019-05-24 17:27:11 +02:00
2021-07-08 11:48:22 -07:00
2022-09-01 16:55:35 +02:00
2017-11-02 11:10:55 +01:00
2020-08-20 15:45:14 -04:00
2019-06-19 17:09:55 +02:00
2017-11-02 11:10:55 +01:00
2022-10-11 17:42:58 -06:00
2021-05-05 16:07:40 +02:00
2019-05-24 17:39:02 +02:00
2021-10-01 16:52:48 -04:00
2019-10-18 15:01:57 +02:00
2022-10-06 05:57:36 -07:00
2022-10-01 10:22:57 -07:00
2019-06-19 17:09:06 +02:00
2021-01-21 14:06:00 -07:00
2021-05-06 19:24:12 -07:00
2019-06-19 17:09:06 +02:00
2022-01-31 11:21:43 +11:00
2018-07-27 19:04:33 +08:00
2022-01-31 11:21:43 +11:00
2022-03-07 12:48:35 -07:00
2022-03-07 12:48:35 -07:00
2019-06-19 17:09:06 +02:00
2022-06-07 10:27:38 +02:00
2020-06-18 17:26:43 +10:00
2017-11-02 11:10:55 +01:00
2021-08-19 09:02:55 +09:00
2021-06-22 13:56:43 +02:00
2022-05-13 12:35:17 +02:00
2018-06-12 23:33:24 +02:00
2021-07-01 11:06:05 -07:00
2020-01-31 10:30:40 -08:00
2021-07-01 11:06:06 -07:00
2021-05-06 19:24:12 -07:00
2021-07-01 11:06:06 -07:00
2021-10-19 23:44:30 +08:00
2021-11-08 16:55:26 -08:00
2020-07-31 11:49:08 +02:00
2021-08-13 14:09:32 -10:00
2022-09-01 18:04:43 +02:00
2020-11-20 14:45:33 +11:00
2022-04-22 21:30:57 +02:00
2022-09-07 17:04:49 +02:00
2020-10-16 11:11:20 -07:00
2021-04-16 16:10:37 -07:00
2020-12-15 22:46:15 -08:00
2022-07-17 17:31:38 -07:00
2020-12-15 22:46:15 -08:00
2021-01-03 20:05:18 -05:00
2020-10-16 11:11:22 -07:00
2022-10-11 17:42:55 -06:00
2020-01-08 16:59:19 +00:00
2014-04-30 19:49:37 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2022-10-11 17:42:55 -06:00
2022-10-06 05:57:36 -07:00
2022-09-19 14:35:08 +02:00
2022-09-14 07:04:15 -07:00
2018-07-27 19:04:33 +08:00
2022-03-07 12:48:35 -07:00
2022-01-15 08:47:31 -08:00
2019-10-14 15:04:00 -07:00
2022-04-29 14:38:01 -07:00
2017-02-24 17:46:57 -08:00
2022-04-27 10:57:33 -07:00
2019-05-13 11:07:33 +02:00
2022-07-10 13:55:49 -07:00
2017-11-02 11:10:55 +01:00
2019-05-21 10:50:45 +02:00
2019-05-21 10:50:45 +02:00
2019-06-19 17:09:56 +02:00
2022-10-03 14:03:21 -07:00
2018-05-09 06:55:44 +02:00
2022-10-03 14:03:18 -07:00
2022-04-13 21:32:21 +02:00
2019-05-30 11:26:32 -07:00
2022-09-07 16:37:27 -07:00
2019-05-24 17:27:11 +02:00
2021-08-19 09:02:55 +09:00
2022-10-10 13:04:25 -07:00
2022-10-10 17:53:04 -07:00
2022-10-03 14:02:57 -07:00
2022-04-22 12:32:04 +02:00
2022-03-22 15:57:11 -07:00
2020-09-28 12:14:08 +01:00
2022-10-03 14:03:22 -07:00
2022-07-14 15:45:26 -07:00
2021-07-08 11:48:20 -07:00
2019-06-19 17:09:08 +02:00
2021-12-28 11:26:18 +01:00
2022-10-11 17:42:55 -06:00
2022-05-13 07:20:13 -07:00
2021-05-19 15:05:11 +02:00
2020-10-16 11:11:19 -07:00
2021-08-13 18:37:38 +02:00
2022-06-16 19:58:20 -07:00
2021-07-08 11:48:20 -07:00
2022-04-05 13:32:27 -06:00
2019-06-05 17:37:06 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2021-12-04 10:56:24 +01:00
2022-07-03 14:40:28 -07:00
2022-03-11 10:42:56 +01:00
2021-02-17 17:31:06 -06:00
2022-07-17 17:31:37 -07:00
2019-05-24 17:39:02 +02:00
2022-10-10 17:53:04 -07:00
2022-09-26 19:46:13 -07:00
2018-10-16 13:45:44 +02:00
2022-09-07 16:37:48 -07:00
2019-05-21 10:50:45 +02:00
2020-09-26 10:33:57 -07:00
2017-11-02 11:10:55 +01:00
2019-05-24 17:39:02 +02:00
2017-11-02 11:10:55 +01:00
2019-05-21 10:50:45 +02:00
2022-09-07 12:33:43 +01:00
2022-04-22 21:30:57 +02:00
2019-07-03 16:57:18 +02:00
2017-11-02 11:10:55 +01:00
2021-12-24 14:54:29 -08:00
2019-05-21 10:50:45 +02:00
2021-07-08 11:48:20 -07:00
2022-10-03 17:34:32 -07:00
2022-10-06 12:57:55 -07:00
2021-09-17 13:52:17 +01:00
2021-04-16 16:10:37 -07:00
2021-07-01 11:06:05 -07:00
2021-09-19 17:13:35 -07:00
2021-05-06 19:24:12 -07:00
2019-05-21 10:50:45 +02:00
2022-05-18 02:20:17 -04:00
2019-05-21 11:28:45 +02:00
2019-05-21 10:50:45 +02:00
2022-05-22 11:32:30 -07:00
2022-07-17 17:31:38 -07:00
2022-05-18 15:53:52 +02:00
2022-08-24 13:46:57 +01:00
2019-09-25 17:51:39 -07:00
2020-08-12 10:58:00 -07:00
2022-02-06 11:05:28 +00:00
2021-07-08 11:48:20 -07:00
2021-07-08 11:48:20 -07:00
2022-10-11 17:42:58 -06:00
2022-07-17 17:31:39 -07:00
2021-07-08 11:48:20 -07:00
2022-09-23 16:46:19 +02:00
2019-08-08 07:45:01 -06:00
2022-09-26 19:46:29 -07:00
2022-06-03 10:34:34 -07:00
2022-04-06 10:11:48 +02:00
2022-07-17 17:31:41 -07:00
2022-03-17 20:17:18 -07:00
2022-10-03 14:03:18 -07:00
2022-09-30 13:21:22 -06:00
2019-05-30 11:26:32 -07:00
2022-09-05 14:51:46 +01:00
2022-10-03 14:03:22 -07:00
2022-04-19 21:58:47 +02:00
2022-04-19 21:58:47 +02:00
2021-06-18 11:43:09 +02:00
2022-10-01 10:22:58 -07:00
2021-07-08 11:48:20 -07:00
2020-08-12 10:58:00 -07:00
2019-07-01 19:34:46 -07:00
2022-06-22 19:20:20 -07:00
2019-05-21 10:50:45 +02:00
2022-09-07 17:04:49 +02:00
2022-05-19 19:28:37 +02:00
2022-03-17 20:17:14 -07:00
2021-01-18 11:03:26 +01:00
2022-07-17 17:14:36 -07:00
2022-01-20 08:52:54 +02:00
2022-10-11 17:42:55 -06:00
2022-07-17 17:14:29 -07:00
2022-10-03 14:03:03 -07:00
2018-10-15 16:31:29 -04:00
2022-03-29 15:13:36 -07:00
2021-10-26 17:23:46 -04:00
2020-05-08 18:18:12 +01:00
2022-10-11 17:42:55 -06:00
2022-02-25 09:36:06 +01:00
2022-09-26 19:46:14 -07:00
2018-10-16 13:45:44 +02:00
2022-04-29 14:38:00 -07:00
2020-03-06 11:56:59 +01:00
2019-05-21 10:50:45 +02:00
2020-06-15 13:32:11 -07:00
2017-02-26 11:03:38 -05:00
2022-07-28 10:38:30 +02:00
2021-12-06 16:04:44 -08:00
2021-03-24 15:16:09 -07:00
2021-09-06 11:04:03 -07:00
2022-05-19 18:54:22 +02:00
2021-09-08 11:50:26 -07:00
2019-06-05 17:36:37 +02:00
2019-06-05 17:36:37 +02:00
2022-04-29 14:38:00 -07:00
2019-04-08 16:44:21 -06:00
2022-05-03 10:15:07 +02:00
2022-01-20 08:52:55 +02:00
2019-10-16 14:56:21 +02:00
2017-07-21 09:38:30 +02:00
2022-10-11 17:42:58 -06:00
2022-03-28 19:25:11 -04:00
2015-09-10 13:29:01 -07:00
2022-10-11 17:42:55 -06:00
2019-10-03 12:12:23 -04:00
2021-02-17 14:08:01 +01:00
2022-06-15 17:41:12 +02:00
2022-07-17 17:31:39 -07:00
2020-11-18 14:15:17 -06:00
2020-04-07 10:43:43 -07:00
2022-03-23 19:00:35 -07:00
2021-02-05 11:03:47 -08:00
2019-05-24 17:39:02 +02:00
2018-06-07 17:34:39 -07:00
2022-10-03 14:03:18 -07:00
2020-03-23 17:01:47 +01:00
2022-10-10 11:24:19 -07:00
2017-11-02 11:10:55 +01:00
2022-06-09 16:24:25 -04:00
2020-08-12 10:58:00 -07:00