Eduard Zingerman 1ffc85d929
bpf: Verify scalar ids mapping in regsafe() using check_ids() ...
Make sure that the following unsafe example is rejected by verifier:
1: r9 = ... some pointer with range X ...
2: r6 = ... unbound scalar ID=a ...
3: r7 = ... unbound scalar ID=b ...
4: if (r6 > r7) goto +1
5: r6 = r7
6: if (r6 > X) goto ...
--- checkpoint ---
7: r9 += r7
8: *(u64 *)r9 = Y
This example is unsafe because not all execution paths verify r7 range.
Because of the jump at (4) the verifier would arrive at (6) in two states:
I. r6{.id=b}, r7{.id=b} via path 1-6;
II. r6{.id=a}, r7{.id=b} via path 1-4, 6.
Currently regsafe() does not call check_ids() for scalar registers,
thus from POV of regsafe() states (I) and (II) are identical. If the
path 1-6 is taken by verifier first, and checkpoint is created at (6)
the path [1-4, 6] would be considered safe.
Changes in this commit:
- check_ids() is modified to disallow mapping multiple old_id to the
same cur_id.
- check_scalar_ids() is added, unlike check_ids() it treats ID zero as
a unique scalar ID.
- check_scalar_ids() needs to generate temporary unique IDs, field
'tmp_id_gen' is added to bpf_verifier_env::idmap_scratch to
facilitate this.
- regsafe() is updated to:
- use check_scalar_ids() for precise scalar registers.
- compare scalar registers using memcmp only for explore_alu_limits
branch. This simplifies control flow for scalar case, and has no
measurable performance impact.
- check_alu_op() is updated to avoid generating bpf_reg_state::id for
constant scalar values when processing BPF_MOV. ID is needed to
propagate range information for identical values, but there is
nothing to propagate for constants.
Fixes: 75748837b7eddyz87@gmail.com >
Signed-off-by: Andrii Nakryiko <andrii@kernel.org >
Acked-by: Andrii Nakryiko <andrii@kernel.org >
Link: https://lore.kernel.org/bpf/20230613153824.3324830-4-eddyz87@gmail.com
2023-06-13 15:15:08 -07:00
2023-01-16 09:26:05 +01:00
2023-04-29 09:09:31 +02:00
2023-01-25 08:55:19 -08:00
2023-05-15 22:53:49 +02:00
2023-03-29 12:26:32 +02:00
2023-02-02 13:40:23 +01:00
2023-01-16 09:26:05 +01:00
2023-05-19 11:03:36 +01:00
2023-03-31 17:49:36 +05:30
2023-01-13 08:40:41 +00:00
2023-04-27 12:07:50 -07:00
2023-01-20 18:20:38 -08:00
2023-03-06 12:33:02 +02:00
2023-03-21 19:25:25 +01:00
2023-04-10 12:26:34 +01:00
2023-02-23 22:12:47 -08:00
2023-04-08 10:50:04 +01:00
2023-04-26 09:05:00 -04:00
2023-03-14 13:28:12 -06:00
2023-02-26 18:31:37 +00:00
2023-05-03 11:25:01 -07:00
2023-02-24 15:11:03 -08:00
2023-05-22 22:38:05 -07:00
2023-04-26 16:07:23 -07:00
2023-04-19 20:39:03 +02:00
2023-04-22 01:39:40 +02:00
2023-05-29 21:46:53 -07:00
2023-04-21 08:29:13 +01:00
2023-03-27 14:01:18 +01:00
2023-02-03 10:52:49 +05:30
2023-02-24 17:12:23 -08:00
2023-04-27 11:42:11 -07:00
2023-05-08 15:29:12 +02:00
2022-12-08 13:02:37 +00:00
2023-01-06 09:16:16 -07:00
2023-04-05 20:58:32 -07:00
2023-04-30 13:00:38 -07:00
2023-04-26 16:07:23 -07:00
2023-04-12 15:30:36 +05:30
2023-04-21 14:37:03 +01:00
2023-01-27 13:45:52 +01:00
2023-05-17 09:56:01 -07:00
2023-02-24 12:58:55 -08:00
2023-05-13 18:04:59 +09:00
2023-03-19 10:48:35 +00:00
2023-04-27 17:17:12 -07:00
2023-03-24 19:19:19 -04:00
2023-03-09 17:32:34 +01:00
2023-03-17 19:06:23 +01:00
2023-04-06 14:24:04 +02:00
2022-12-01 15:51:32 +00:00
2023-04-08 10:51:23 +01:00
2023-03-24 19:19:19 -04:00
2023-03-23 10:29:25 +09:00
2023-02-07 12:53:53 +01:00
2023-01-12 11:22:22 +01:00
2022-11-30 15:59:06 -08:00
2023-02-09 23:01:49 +01:00
2023-04-17 18:01:22 +02:00
2023-01-19 14:46:25 +01:00
2023-01-31 14:42:10 +01:00
2023-04-26 12:52:58 -07:00
2023-03-16 09:35:09 -06:00
2023-04-26 12:52:58 -07:00
2023-05-20 05:38:01 -06:00
2023-02-22 08:27:49 +09:00
2023-03-25 19:52:52 -07:00
2022-12-04 12:59:58 -08:00
2023-03-25 19:52:51 -07:00
2023-04-22 08:21:05 -07:00
2023-06-13 15:15:08 -07:00
2023-05-23 23:31:42 +02:00
2023-05-31 13:06:57 +02:00
2023-05-13 16:56:29 +01:00
2023-03-07 07:49:28 -08:00
2023-05-19 22:44:14 -07:00
2023-04-21 14:52:01 -07:00
2023-02-03 08:20:55 -07:00
2023-04-14 10:13:39 +01:00
2023-03-01 10:01:22 -08:00
2023-04-18 16:29:49 -07:00
2023-04-29 17:29:39 -07:00
2023-01-13 11:48:15 +01:00
2023-04-13 11:49:35 -07:00
2023-03-05 10:49:37 -08:00
2023-03-05 10:49:37 -08:00
2023-05-17 09:36:46 -07:00
2022-12-02 11:11:27 +01:00
2023-01-19 15:06:42 +01:00
2023-02-24 12:17:14 -08:00
2023-01-31 12:44:20 +01:00
2023-03-21 11:53:16 +01:00
2023-04-28 14:02:54 -07:00
2022-12-12 18:18:34 -08:00
2023-01-19 10:16:47 +00:00
2023-01-20 11:38:15 +00:00
2023-03-24 16:04:21 -07:00
2023-03-08 08:44:28 -08:00
2023-04-27 10:09:05 -07:00
2023-04-25 12:39:01 -07:00
2023-01-18 12:27:17 +01:00
2023-03-25 12:57:34 -07:00
2023-03-23 16:02:27 -10:00
2023-04-17 18:01:23 +02:00
2023-04-20 18:20:04 +08:00
2023-02-02 22:33:25 -08:00
2023-02-10 17:33:34 -08:00
2023-03-18 12:23:33 +00:00
2022-11-30 16:13:16 -08:00
2023-04-18 16:39:34 -07:00
2023-01-30 07:37:40 -08:00
2023-04-14 12:32:20 -04:00
2023-03-24 15:35:31 +01:00
2023-01-19 16:07:40 +01:00
2023-05-09 11:06:45 +02:00
2023-03-06 15:49:07 -06:00
2023-03-30 15:57:50 -04:00
2023-02-14 14:23:06 -05:00
2023-02-14 14:23:06 -05:00
2023-02-14 14:23:06 -05:00
2023-02-14 14:23:06 -05:00
2022-11-24 10:39:08 +01:00
2023-03-25 10:55:07 -07:00
2023-04-07 07:38:20 +02:00
2023-03-28 13:39:02 -07:00
2023-02-24 17:18:54 -08:00
2023-02-03 11:06:03 +01:00
2023-01-29 15:18:33 -07:00
2023-01-29 15:18:33 -07:00
2023-01-29 15:18:33 -07:00
2023-01-29 15:18:33 -07:00
2023-03-19 13:25:20 -07:00
2023-03-13 23:28:43 +01:00
2023-01-05 15:12:12 +00:00
2023-02-02 22:50:00 -08:00
2023-02-06 19:06:58 +01:00
2023-04-13 22:22:10 -07:00
2023-04-18 20:48:59 -07:00
2022-12-13 10:33:08 -08:00
2023-01-19 09:24:28 +01:00
2023-04-26 09:04:59 -04:00
2023-04-10 10:58:45 -07:00
2023-02-07 12:53:53 +01:00
2023-04-13 07:38:54 -06:00
2023-03-29 16:00:23 +02:00
2023-01-19 09:24:27 +01:00
2023-01-11 06:52:43 -05:00
2023-06-06 17:05:21 +02:00
2023-03-19 10:02:04 -07:00
2023-02-24 12:58:55 -08:00
2023-01-05 12:08:29 -08:00
2023-03-28 18:52:22 -04:00
2023-03-16 14:38:28 +01:00
2022-12-01 10:46:54 -05:00
2023-04-29 10:35:48 -07:00
2022-11-23 10:31:13 -08:00
2023-04-26 08:57:41 -07:00
2023-04-11 19:23:15 -07:00
2023-05-05 13:11:02 -07:00
2023-02-08 13:37:54 +01:00
2023-04-01 20:27:55 -06:00
2023-03-28 16:20:16 -07:00
2023-04-05 19:42:53 -07:00
2023-03-06 12:33:02 +02:00
2023-01-17 18:50:06 +01:00
2023-04-08 13:45:38 -07:00
2023-01-18 22:08:38 +01:00
2022-12-20 15:24:57 +01:00
2023-03-30 17:35:42 +02:00
2023-02-13 14:16:35 +01:00
2023-04-18 16:29:51 -07:00
2023-02-24 12:47:33 -08:00
2023-04-04 13:59:10 +02:00
2022-12-02 13:10:36 -08:00
2023-04-05 19:42:56 -07:00
2023-02-13 15:54:27 -08:00
2023-04-27 19:42:02 -07:00
2023-03-10 21:05:16 +01:00
2022-12-04 16:45:02 -08:00
2023-04-07 08:45:17 -07:00
2023-02-24 12:58:55 -08:00
2023-05-03 17:27:29 +02:00
2023-02-02 21:08:32 +01:00
2023-04-13 16:32:02 +02:00
2023-01-03 19:48:43 +01:00
2023-04-21 08:25:49 +01:00
2023-05-19 22:46:37 -07:00
2023-05-10 10:25:55 +01:00
2023-03-17 08:56:37 +00:00
2023-02-22 12:36:25 -08:00
2022-11-30 16:13:18 -08:00
2023-03-07 10:11:28 -08:00
2022-12-30 19:57:38 +01:00
2023-02-06 13:47:40 +01:00
2023-04-05 11:29:59 +03:00
2022-11-29 16:34:15 -04:00
2023-04-15 14:44:57 -06:00
2023-05-09 07:59:54 -06:00
2023-03-28 16:20:16 -07:00
2023-04-21 08:54:47 -07:00
2023-04-30 13:00:38 -07:00
2023-03-31 13:43:32 -03:00
2022-12-16 03:54:54 -08:00
2023-02-01 20:54:27 -08:00
2023-03-18 12:23:33 +00:00
2023-02-05 10:57:55 +00:00
2022-12-05 22:22:34 +01:00
2023-02-24 14:34:12 -08:00
2022-11-24 17:55:05 +01:00
2023-01-25 09:46:49 +00:00
2023-01-26 06:59:40 -05:00
2023-03-12 08:55:55 -07:00
2022-12-01 15:53:05 -08:00
2023-03-19 13:27:19 -07:00
2023-01-18 17:12:55 -08:00
2022-12-11 19:30:20 -08:00
2023-01-05 12:21:11 -08:00
2022-11-29 09:26:07 +00:00
2023-04-08 13:45:38 -07:00
2023-04-08 13:45:38 -07:00
2023-02-13 10:11:20 +02:00
2022-11-30 15:58:41 -08:00
2023-04-18 16:30:09 -07:00
2022-11-22 17:34:43 +01:00
2023-03-24 15:35:51 +01:00
2023-02-21 08:49:16 +09:00
2023-05-02 17:21:50 -07:00
2023-05-01 12:06:20 -07:00
2023-03-27 10:13:28 -04:00
2023-03-23 16:10:59 -07:00
2023-05-02 10:36:02 -07:00
2023-03-24 19:19:19 -04:00
2023-04-27 13:45:31 -07:00
2023-02-13 17:01:05 -08:00
2022-11-30 14:49:42 -08:00
2023-01-06 16:37:46 +01:00
2023-03-22 17:09:28 +01:00
2023-03-22 17:09:28 +01:00
2023-03-27 11:16:04 -07:00
2022-11-22 19:38:39 -07:00
2023-03-08 13:29:49 -05:00
2023-04-24 11:21:50 -07:00
2023-04-18 11:48:55 -05:00
2023-02-09 16:51:30 -08:00
2023-01-31 15:01:47 +01:00
2022-12-08 21:49:25 -05:00
2023-01-27 13:45:49 +01:00
2023-01-10 15:53:36 -08:00
2023-05-29 21:46:53 -07:00
2023-04-05 19:42:55 -07:00
2023-04-18 16:29:50 -07:00
2023-04-18 16:30:11 -07:00
2023-02-10 17:33:29 -08:00
2023-01-05 16:15:26 -06:00
2023-01-27 12:31:41 +05:30
2023-03-07 22:04:45 +05:30
2023-02-08 09:16:07 +00:00
2023-02-20 12:46:18 -08:00
2022-11-24 17:12:15 +01:00
2023-04-05 19:42:44 -07:00
2022-11-30 15:58:40 -08:00
2023-04-28 14:53:30 -07:00
2023-04-28 09:43:49 -07:00
2023-02-02 22:33:24 -08:00
2023-04-05 20:02:57 -07:00
2023-03-16 13:08:40 -07:00
2023-02-02 22:32:54 -08:00
2023-04-18 16:30:11 -07:00
2023-01-19 09:24:30 +01:00
2023-03-29 12:26:32 +02:00
2023-04-13 17:15:50 -07:00
2023-04-27 16:36:55 -07:00
2023-02-23 14:00:10 -08:00
2023-02-24 19:20:07 -08:00
2022-12-05 22:22:34 +01:00
2023-03-05 11:19:16 -08:00
2023-04-24 00:09:20 -05:00
2023-04-03 10:04:27 +01:00
2023-04-23 13:35:07 +01:00
2023-03-08 14:25:40 +01:00
2023-04-21 11:34:14 -07:00
2023-02-20 17:25:43 -06:00
2023-03-27 19:49:58 -07:00
2022-12-10 11:01:12 -05:00
2023-04-11 16:13:21 -04:00
2023-04-11 13:08:26 -04:00
2023-04-11 13:08:26 -04:00
2023-02-20 09:20:21 -05:00
2023-04-28 15:48:45 -04:00
2023-04-26 09:05:00 -04:00
2023-01-19 15:55:12 -08:00
2023-02-21 14:45:22 -08:00
2023-04-04 08:35:34 -07:00
2023-03-22 09:19:56 +01:00
2023-03-15 14:58:52 +01:00
2023-04-05 19:41:11 +02:00
2023-04-05 19:41:13 +02:00
2023-03-23 23:18:58 +01:00
2023-03-23 23:18:58 +01:00
2023-04-13 17:46:35 -05:00
2023-04-27 12:07:50 -07:00
2023-03-06 12:33:01 +02:00
2023-01-25 11:48:28 +01:00
2023-03-19 10:48:35 +00:00
2022-11-29 10:45:53 +01:00
2023-04-13 17:46:34 -05:00
2023-04-27 12:07:50 -07:00
2023-04-05 19:42:54 -07:00
2023-01-11 16:14:22 -08:00
2023-04-27 19:42:02 -07:00
2023-04-05 19:42:46 -07:00
2023-04-27 19:42:02 -07:00
2023-02-02 22:33:18 -08:00
2023-01-18 17:12:39 -08:00
2022-12-02 13:04:44 -08:00
2023-01-20 13:12:00 +01:00
2023-01-16 09:26:06 +01:00
2023-05-08 11:25:19 +02:00
2023-04-18 10:36:58 -07:00
2023-02-14 07:27:32 +09:00
2023-02-14 07:27:32 +09:00
2023-04-30 11:51:51 -07:00
2023-05-29 21:46:53 -07:00
2023-04-20 15:43:34 +02:00
2023-03-19 10:02:04 -07:00
2023-01-13 11:48:17 +01:00
2022-12-12 16:07:04 -08:00
2023-01-18 11:57:20 +01:00
2023-03-28 16:20:12 -07:00
2023-05-24 08:28:27 +01:00
2023-05-24 09:13:22 -07:00
2023-01-18 17:12:37 -08:00
2023-04-03 11:16:56 +02:00
2023-02-20 17:25:43 -06:00
2023-01-04 14:44:13 -07:00
2023-01-17 19:04:17 +01:00
2023-01-10 11:07:10 -06:00
2023-02-13 19:17:34 +01:00
2023-02-21 18:24:12 -08:00
2023-03-06 09:57:13 +01:00
2023-03-06 09:57:07 +01:00
2023-04-21 15:34:33 +02:00
2023-03-29 22:38:56 +02:00
2022-12-20 03:13:45 +01:00
2023-01-11 15:35:11 +01:00
2023-04-20 22:55:35 -04:00
2023-04-20 14:25:07 +02:00
2023-04-05 09:58:50 +02:00
2023-04-05 09:58:50 +02:00
2023-04-20 18:20:05 +08:00
2023-03-17 11:16:43 +08:00
2023-03-17 11:16:43 +08:00
2023-01-13 08:40:41 +00:00
2023-03-17 21:57:52 -07:00
2023-02-22 10:55:22 +00:00
2023-04-13 14:27:53 +02:00
2023-01-19 09:24:29 +01:00
2023-03-24 19:19:19 -04:00
2022-12-20 03:13:45 +01:00
2023-02-10 17:32:37 -08:00
2023-04-18 16:39:33 -07:00
2023-01-03 17:28:33 -08:00
2023-03-29 10:35:41 +02:00
2023-03-28 10:39:29 +02:00
2023-01-03 17:48:40 -08:00
2023-01-03 17:48:40 -08:00
2023-04-07 17:28:19 +01:00
2023-01-23 17:40:30 +01:00
2022-12-09 10:42:56 +00:00
2022-11-23 19:08:30 -05:00
2023-02-27 17:00:14 -08:00
2023-04-13 16:04:28 -07:00
2023-04-28 15:57:53 -07:00
2023-01-19 09:49:54 +00:00
2023-04-21 08:19:30 +01:00
2022-12-02 11:33:48 -08:00
2023-04-24 13:39:58 -07:00
2023-04-19 14:07:13 -06:00
2023-04-18 11:15:24 -07:00
2023-04-25 21:03:14 -04:00
2023-04-23 21:51:25 -07:00
2023-03-17 15:00:40 +01:00
2023-03-17 15:00:40 +01:00
2023-01-19 15:01:19 +01:00
2022-12-15 10:37:27 -08:00
2023-05-18 19:52:31 -07:00
2023-02-27 10:49:43 +01:00
2023-04-18 16:29:55 -07:00
2023-05-17 15:24:33 -07:00
2023-05-25 19:57:39 -07:00
2023-05-23 16:10:11 +02:00
2023-01-18 17:12:55 -08:00
2023-04-27 19:42:02 -07:00
2023-01-18 17:12:55 -08:00
2023-04-28 15:03:43 -07:00
2023-04-03 10:08:43 +01:00
2023-05-23 20:48:27 -07:00
2023-01-31 20:37:18 +01:00
2023-03-27 11:15:59 -07:00
2023-04-04 08:35:34 -07:00
2023-04-05 13:50:37 +00:00
2023-02-16 20:43:52 -08:00
2023-04-14 17:31:23 +02:00
2023-01-26 07:00:06 -05:00
2023-04-13 12:50:46 +02:00
2023-02-09 22:30:24 -08:00
2023-01-18 17:12:47 -08:00
2023-04-20 19:06:12 +02:00
2023-04-21 14:52:02 -07:00
2023-01-18 17:12:38 -08:00
2023-04-29 10:29:57 -07:00
2023-04-16 14:23:07 +02:00
2023-05-02 19:24:16 -07:00
2023-03-18 11:44:57 +01:00
2023-03-18 12:23:34 +00:00
2023-04-27 19:20:12 +02:00
2023-01-13 11:48:16 +01:00
2023-04-05 13:47:43 +00:00
2022-12-01 11:35:40 +01:00
2022-11-24 15:09:12 +01:00
2023-02-07 18:20:00 -08:00
2023-01-13 17:15:17 +01:00
2023-05-16 02:43:12 +03:00
2023-02-12 10:23:39 -05:00
2023-01-31 15:01:46 +01:00
2023-02-07 12:42:54 -05:00
2023-02-07 12:49:56 -05:00
2023-03-14 17:07:54 -07:00
2023-01-20 14:22:50 +01:00
2023-01-19 16:04:35 +01:00
2023-01-19 16:04:35 +01:00
2023-04-27 11:53:57 -07:00
2023-03-28 10:39:29 +02:00
2023-01-12 20:57:43 -08:00
2023-01-20 12:06:26 +01:00
2023-03-16 13:08:39 -07:00
2023-02-08 15:26:58 -08:00
2023-03-18 12:23:33 +00:00
2023-05-02 17:21:50 -07:00
2023-04-27 11:42:11 -07:00
2023-03-29 06:52:09 -04:00
2023-04-27 19:42:02 -07:00
2023-02-23 17:55:40 -08:00
2023-03-23 17:25:46 +01:00
2023-04-21 03:02:35 -04:00
2023-05-02 11:56:43 -07:00
2023-02-15 06:46:22 -05:00
2022-12-12 09:29:56 +00:00
2023-04-21 03:02:35 -04:00
2023-03-29 08:19:38 +01:00
2023-04-21 03:02:30 -04:00
2023-04-05 20:03:01 -07:00
2023-04-05 19:42:57 -07:00
2023-04-05 20:03:01 -07:00
2023-04-21 03:02:34 -04:00
2023-04-24 11:48:33 +02:00
2023-03-23 15:55:38 -10:00
2023-04-17 18:01:22 +02:00
2023-03-17 22:38:31 -07:00
2023-02-02 22:33:24 -08:00
2023-03-06 09:57:11 +01:00
2022-11-30 15:58:52 -08:00
1ffc85d929