[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 32cd3db7de97c0c7a018756ce66244342fd583f0
WARNING: Author mismatch between patch and upstream commit:
Backport author: Vasiliy Kovalev<kovalev@xxxxxxxxxxxx>
Commit author: Maciej Fijalkowski<maciej.fijalkowski@xxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (different SHA1: d486b5741d98)
6.6.y | Present (different SHA1: f8abd03f83d5)
6.1.y | Present (different SHA1: ed08c93d5a98)
5.15.y | Present (different SHA1: 4d03f705e9d7)
5.10.y | Not found
Note: The patch differs from the upstream commit:
---
1: 32cd3db7de97 ! 1: 56235b048d31 xsk: fix OOB map writes when deleting elements
@@ Metadata
## Commit message ##
xsk: fix OOB map writes when deleting elements
+ commit 32cd3db7de97c0c7a018756ce66244342fd583f0 upstream.
+
Jordy says:
"
@@ Commit message
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx>
Link: https://lore.kernel.org/r/20241122121030.716788-2-maciej.fijalkowski@xxxxxxxxx
Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
+ Signed-off-by: Vasiliy Kovalev <kovalev@xxxxxxxxxxxx>
## net/xdp/xskmap.c ##
-@@ net/xdp/xskmap.c: static long xsk_map_delete_elem(struct bpf_map *map, void *key)
+@@ net/xdp/xskmap.c: static int xsk_map_delete_elem(struct bpf_map *map, void *key)
+ {
struct xsk_map *m = container_of(map, struct xsk_map, map);
- struct xdp_sock __rcu **map_entry;
- struct xdp_sock *old_xs;
+ struct xdp_sock *old_xs, **map_entry;
- int k = *(u32 *)key;
+ u32 k = *(u32 *)key;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
