Hou Tao 3af43ba4c6
bpf: Pass map file to .map_update_batch directly ...
Currently bpf_map_do_batch() first invokes fdget(batch.map_fd) to get
the target map file, then it invokes generic_map_update_batch() to do
batch update. generic_map_update_batch() will get the target map file
by using fdget(batch.map_fd) again and pass it to bpf_map_update_value().
The problem is map file returned by the second fdget() may be NULL or a
totally different file compared by map file in bpf_map_do_batch(). The
reason is that the first fdget() only guarantees the liveness of struct
file instead of file descriptor and the file description may be released
by concurrent close() through pick_file().
It doesn't incur any problem as for now, because maps with batch update
support don't use map file in .map_fd_get_ptr() ops. But it is better to
fix the potential access of an invalid map file.
Using __bpf_map_get() again in generic_map_update_batch() can not fix
the problem, because batch.map_fd may be closed and reopened, and the
returned map file may be different with map file got in
bpf_map_do_batch(), so just passing the map file directly to
.map_update_batch() in bpf_map_do_batch().
Signed-off-by: Hou Tao <houtao1@huawei.com >
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net >
Acked-by: Yonghong Song <yhs@fb.com >
Link: https://lore.kernel.org/bpf/20221116075059.1551277-1-houtao@huaweicloud.com
2022-11-17 17:12:35 +01:00
2022-08-30 11:12:52 +01:00
2022-10-27 13:23:43 +02:00
2022-09-19 12:59:33 +03:00
2022-11-07 14:00:27 +01:00
2022-10-04 19:18:08 +02:00
2022-10-16 11:08:19 -07:00
2022-08-23 13:14:02 +02:00
2022-09-04 22:49:35 +05:30
2022-10-14 08:22:28 +01:00
2022-09-20 08:33:04 -07:00
2022-09-04 22:12:15 +02:00
2022-09-05 18:08:42 +01:00
2022-09-16 06:38:50 -07:00
2022-07-25 09:42:24 +01:00
2022-08-04 10:28:48 -04:00
2022-08-02 15:06:57 -05:00
2022-10-03 11:08:33 +01:00
2022-09-28 16:09:49 +01:00
2022-11-12 02:20:19 -08:00
2022-10-06 13:31:13 +02:00
2022-10-08 08:56:37 -07:00
2022-08-23 18:23:15 +02:00
2022-10-10 09:27:46 -07:00
2022-10-07 16:48:26 -07:00
2022-10-11 10:53:25 -07:00
2022-10-03 21:52:33 -07:00
2022-09-29 15:20:14 +01:00
2022-10-12 11:00:22 -07:00
2022-11-11 08:09:32 +00:00
2022-10-07 16:13:55 -07:00
2022-10-26 17:38:46 -07:00
2022-10-13 09:58:42 -07:00
2022-10-07 16:48:26 -07:00
2022-10-10 13:28:06 -07:00
2022-09-17 01:40:11 +09:00
2022-10-05 11:05:17 -06:00
2022-09-08 11:34:04 +01:00
2022-09-21 11:18:28 +09:00
2022-07-28 11:29:36 +02:00
2022-08-04 08:33:54 -06:00
2022-07-29 18:12:35 -07:00
2022-07-29 18:07:15 -07:00
2022-08-02 12:34:03 -04:00
2022-08-02 17:14:47 -06:00
2022-09-29 16:38:05 -07:00
2022-09-12 00:19:48 -06:00
2022-09-26 12:19:12 -07:00
2022-10-12 11:00:22 -07:00
2022-09-20 08:24:38 -06:00
2022-09-26 19:17:28 -06:00
2022-08-22 10:07:53 -06:00
2022-08-22 10:07:53 -06:00
2022-08-22 10:07:53 -06:00
2022-10-27 07:15:44 -06:00
2022-10-10 11:26:40 -06:00
2022-08-11 16:14:29 -07:00
2022-10-25 23:19:19 -07:00
2022-09-05 15:33:07 +02:00
2022-10-25 23:19:19 -07:00
2022-10-25 23:11:46 -07:00
2022-08-23 16:08:21 -07:00
2022-11-17 17:12:35 +01:00
2022-08-04 16:57:43 -07:00
2022-08-17 11:49:23 +01:00
2022-10-25 23:19:19 -07:00
2022-11-03 23:09:40 -07:00
2022-10-10 17:53:04 -07:00
2022-09-26 19:46:29 -07:00
2022-09-26 10:13:13 -07:00
2022-09-26 10:13:13 -07:00
2022-11-02 08:18:27 -07:00
2022-10-17 18:52:43 -07:00
2022-10-14 13:44:44 -07:00
2022-09-15 09:32:06 -07:00
2022-09-30 14:50:11 -07:00
2022-10-10 10:21:22 -07:00
2022-10-10 17:53:04 -07:00
2022-10-10 17:53:04 -07:00
2022-10-03 14:03:19 -07:00
2022-09-26 10:13:14 -07:00
2022-09-07 21:53:49 +02:00
2022-08-31 10:56:36 -06:00
2022-10-17 09:51:29 -04:00
2022-11-14 10:47:07 +00:00
2022-10-16 10:45:17 -07:00
2022-10-12 18:51:49 -07:00
2022-10-10 19:45:17 -07:00
2022-09-05 13:02:34 +02:00
2022-09-26 19:46:07 -07:00
2022-07-28 17:36:30 -04:00
2022-08-23 15:02:47 -05:00
2022-07-28 17:46:14 -04:00
2022-08-08 15:16:29 -07:00
2022-09-07 10:38:28 +02:00
2022-09-21 10:22:54 +02:00
2022-09-07 17:04:49 +02:00
2022-09-01 05:15:51 +02:00
2022-10-24 10:21:02 +02:00
2022-10-11 18:51:11 -07:00
2022-08-29 12:57:38 +01:00
2022-11-08 10:36:54 +01:00
2022-09-21 10:30:42 -06:00
2022-09-29 04:40:15 +09:00
2022-10-04 13:31:45 -07:00
2022-10-17 13:49:45 +02:00
2022-11-15 09:00:27 -08:00
2022-10-06 05:57:36 -07:00
2022-11-04 14:46:45 -07:00
2022-09-07 21:53:50 +02:00
2022-10-10 19:45:17 -07:00
2022-08-31 14:57:28 +01:00
2022-10-19 20:54:43 -07:00
2022-09-26 12:27:55 +02:00
2022-09-27 14:48:26 -04:00
2022-08-22 17:16:24 -07:00
2022-08-29 12:47:15 +01:00
2022-08-07 17:52:35 -07:00
2022-10-03 14:03:30 -07:00
2022-09-04 15:31:59 +03:00
2022-09-20 11:53:32 +01:00
2022-07-25 17:45:40 +02:00
2022-10-03 14:03:20 -07:00
2022-07-28 11:29:36 +02:00
2022-09-16 18:29:45 +08:00
2022-09-13 14:04:34 +02:00
2022-09-28 16:17:40 +01:00
2022-10-03 14:02:45 -07:00
2022-09-11 20:25:53 -07:00
2022-10-12 11:16:58 -07:00
2022-08-30 10:56:22 +02:00
2022-08-19 18:39:34 +08:00
2022-08-16 12:46:26 +02:00
2022-10-07 15:24:15 +02:00
2022-10-12 12:56:28 +02:00
2022-11-03 20:46:32 -07:00
2022-07-28 11:29:36 +02:00
2022-07-28 11:29:36 +02:00
2022-09-20 08:59:18 -07:00
2022-09-20 08:59:18 -07:00
2022-07-28 11:29:36 +02:00
2022-07-28 11:29:36 +02:00
2022-11-11 18:18:05 -08:00
2022-09-02 20:34:31 -07:00
2022-10-12 11:00:22 -07:00
2022-10-03 14:03:21 -07:00
2022-08-16 16:38:42 +03:00
2022-10-12 16:30:56 -06:00
2022-10-04 08:13:20 -06:00
2022-09-26 15:52:31 +02:00
2022-09-01 18:04:43 +02:00
2022-08-11 13:11:49 -07:00
2022-10-21 10:49:32 +02:00
2022-10-10 13:28:06 -07:00
2022-08-10 09:15:16 +02:00
2022-09-08 12:59:00 -06:00
2022-09-26 13:31:20 +02:00
2022-10-03 14:21:44 -07:00
2022-09-28 14:21:53 +01:00
2022-09-19 15:08:38 +02:00
2022-09-15 10:28:18 +02:00
2022-10-03 14:21:43 -07:00
2022-08-04 20:13:46 -07:00
2022-09-28 08:56:25 +02:00
2022-10-03 14:02:59 -07:00
2022-09-01 18:08:44 +02:00
2022-09-11 21:55:06 -07:00
2022-09-21 17:32:48 -07:00
2022-10-03 14:03:33 -07:00
2022-10-28 13:37:23 -07:00
2022-10-03 14:03:19 -07:00
2022-10-03 14:03:21 -07:00
2022-10-03 14:03:25 -07:00
2022-09-26 20:30:39 -07:00
2022-10-03 14:02:43 -07:00
2022-10-27 06:47:53 -04:00
2022-08-01 03:21:00 -04:00
2022-10-07 10:48:49 -07:00
2022-07-26 12:23:01 -07:00
2022-09-16 22:27:19 +02:00
2022-10-06 17:31:02 -07:00
2022-10-03 17:51:52 -07:00
2022-09-26 19:46:13 -07:00
2022-08-02 23:56:25 -04:00
2022-10-04 12:06:58 -06:00
2022-11-09 19:28:49 -08:00
2022-09-12 15:23:11 +03:00
2022-10-10 17:53:04 -07:00
2022-10-03 14:03:29 -07:00
2022-09-26 19:46:12 -07:00
2022-09-11 20:25:50 -07:00
2022-10-12 18:51:49 -07:00
2022-10-12 18:51:49 -07:00
2022-07-27 14:04:52 +02:00
2022-10-03 14:03:35 -07:00
2022-09-26 19:46:18 -07:00
2022-10-03 14:03:19 -07:00
2022-10-03 14:03:28 -07:00
2022-09-19 14:35:08 +02:00
2022-10-10 17:53:04 -07:00
2022-10-25 10:14:50 -07:00
2022-08-02 12:34:04 -04:00
2022-09-02 20:34:31 -07:00
2022-09-02 20:34:31 -07:00
2022-11-07 08:42:19 +00:00
2022-09-01 17:39:49 -04:00
2022-10-24 13:44:11 -07:00
2022-11-15 09:00:27 -08:00
2022-08-22 14:26:30 +01:00
2022-08-22 14:26:30 +01:00
2022-08-03 10:35:43 -07:00
2022-10-19 13:00:04 -07:00
2022-08-13 13:02:14 -04:00
2022-08-09 14:11:34 -04:00
2022-07-29 20:16:58 -04:00
2022-07-28 11:29:36 +02:00
2022-07-27 21:35:32 +10:00
2022-10-03 14:03:15 -07:00
2022-10-11 17:42:55 -06:00
2022-08-02 17:14:49 -06:00
2022-09-27 09:22:09 +02:00
2022-08-02 19:24:24 -07:00
2022-08-25 14:00:31 -05:00
2022-09-28 14:11:28 +01:00
2022-09-30 16:23:48 -05:00
2022-10-03 17:34:32 -07:00
2022-09-26 19:46:27 -07:00
2022-10-25 14:57:42 -07:00
2022-09-26 19:46:29 -07:00
2022-09-11 20:26:02 -07:00
2022-09-11 20:25:57 -07:00
2022-09-26 19:46:09 -07:00
2022-09-26 19:46:09 -07:00
2022-10-03 14:03:04 -07:00
2022-10-10 17:53:04 -07:00
2022-08-05 16:32:45 -07:00
2022-09-11 20:26:00 -07:00
2022-10-04 09:46:22 -07:00
2022-07-26 07:28:08 -04:00
2022-10-11 11:08:18 -07:00
2022-09-05 10:16:53 +01:00
2022-09-06 11:19:34 +02:00
2022-10-03 14:21:43 -07:00
2022-08-30 10:56:23 +02:00
2022-10-17 16:32:05 +02:00
2022-09-26 19:46:08 -07:00
2022-07-28 11:29:36 +02:00
2022-11-08 10:36:54 +01:00
2022-11-07 17:54:57 -08:00
2022-08-08 22:37:19 -04:00
2022-10-04 20:52:38 +02:00
2022-10-04 20:52:38 +02:00
2022-09-15 02:44:07 -07:00
2022-08-31 16:37:58 +02:00
2022-09-11 10:52:05 +02:00
2022-07-28 11:29:36 +02:00
2022-07-26 09:49:12 -07:00
2022-07-28 11:29:36 +02:00
2022-10-11 17:42:58 -06:00
2022-09-19 14:35:07 +02:00
2022-10-04 15:55:55 +02:00
2022-11-08 16:42:15 +00:00
2022-09-24 15:03:25 +02:00
2022-09-09 11:08:33 +02:00
2022-09-09 11:08:33 +02:00
2022-11-11 10:58:39 +00:00
2022-07-28 11:29:36 +02:00
2022-07-28 11:29:36 +02:00
2022-09-19 06:17:05 -07:00
2022-08-14 13:31:03 -07:00
2022-10-11 17:42:58 -06:00
2022-10-18 10:27:02 -07:00
2022-08-31 05:09:22 -07:00
2022-08-31 05:09:22 -07:00
2022-10-04 15:59:36 +02:00
2022-08-17 13:00:31 +01:00
2022-09-28 10:46:21 -06:00
2022-09-23 14:25:05 +02:00
2022-09-28 20:27:43 -04:00
2022-10-10 17:53:04 -07:00
2022-10-31 18:10:21 -07:00
2022-07-30 14:01:28 -04:00
2022-09-15 16:14:02 +02:00
2022-09-12 00:10:34 -06:00
2022-07-26 07:27:47 -04:00
2022-10-14 12:28:43 -07:00
2022-08-22 18:01:45 +01:00
2022-10-09 14:05:15 -07:00
2022-08-22 07:52:51 -06:00
2022-07-28 11:29:36 +02:00
2022-09-09 10:44:35 +02:00
2022-09-22 16:30:14 +02:00
2022-09-25 09:28:57 +02:00
2022-10-28 21:56:18 -07:00
2022-10-03 14:03:33 -07:00
2022-11-11 18:18:05 -08:00
2022-11-03 13:51:06 +01:00
2022-10-15 21:42:05 +02:00
2022-11-04 14:57:21 +01:00
2022-10-25 11:44:20 -07:00
2022-09-02 20:34:30 -07:00
2022-09-15 16:14:02 +02:00
2022-09-15 16:14:02 +02:00
2022-09-15 16:14:02 +02:00
2022-09-15 16:14:02 +02:00
2022-09-15 16:14:02 +02:00
2022-08-31 05:10:15 -07:00
2022-10-03 14:03:18 -07:00
2022-09-11 19:47:04 -05:00
2022-08-17 20:40:52 -07:00
2022-10-08 08:56:37 -07:00
2022-09-07 16:37:26 -07:00
2022-07-28 11:29:36 +02:00
2022-10-10 09:10:28 -07:00
2022-09-07 12:42:25 +01:00
2022-10-03 14:03:36 -07:00
2022-10-03 14:03:36 -07:00
2022-09-26 19:46:05 -07:00
2022-09-26 19:46:05 -07:00
2022-08-08 18:06:43 -07:00
2022-09-29 15:20:29 +02:00
2022-10-28 10:47:42 +01:00
2022-09-09 10:44:35 +02:00
2022-10-04 11:21:06 +02:00
2022-08-31 14:05:12 +01:00
2022-08-09 20:02:13 +02:00
2022-09-02 14:44:54 +02:00
2022-08-03 23:56:20 +03:00
2022-09-28 20:28:13 -04:00
2022-09-25 12:39:52 -04:00
2022-08-05 09:41:12 -07:00
2022-09-22 16:12:34 +02:00
2022-08-30 14:22:34 +02:00
2022-09-22 16:12:34 +02:00
2022-09-19 14:35:08 +02:00
2022-10-03 14:03:18 -07:00
2022-08-31 13:37:32 +02:00
2022-11-08 16:42:28 +00:00
2022-09-16 10:56:08 +01:00
2022-09-07 21:53:48 +02:00
2022-08-28 16:52:28 +01:00
2022-08-30 15:32:04 +02:00
2022-09-29 10:17:37 -04:00
2022-10-28 13:37:22 -07:00
2022-10-23 12:01:01 -07:00
2022-10-07 09:32:40 -04:00
2022-09-21 17:32:49 -07:00
2022-09-21 14:15:10 -06:00
2022-10-07 08:10:52 -06:00
2022-08-01 07:42:49 +02:00
2022-08-16 01:40:24 -04:00
2022-10-07 09:32:40 -04:00
2022-08-11 04:06:40 -04:00
2022-08-11 04:06:38 -04:00
2022-08-16 01:40:24 -04:00
2022-09-26 19:46:18 -07:00
2022-09-26 19:46:18 -07:00
2022-09-01 16:55:35 +02:00
2022-08-26 09:30:25 -07:00
2022-09-28 10:00:16 +02:00
2022-10-07 15:00:25 +02:00
2022-10-03 14:03:08 -07:00
2022-11-02 11:51:03 +00:00
2022-08-31 16:38:07 +02:00
3af43ba4c6