net: fix buffer overflow in af_xdp_umem_create()
PATCH 1/1 net: fix buffer overflow in af_xdp_umem_create()
s->pool has n_descs elements so maximum i should be n_descs - 1. Fix the upper bound.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- net/af-xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/af-xdp.c +1 -1
@@ -323,7 +323,7 @@ static int af_xdp_umem_create(AFXDPState *s, int sock_fd, Error **errp) s->pool =g_new (uint64_t, n_descs);/* Fill the pool in the opposite order, because it's a LIFO queue. */ -for (i = n_descs; i >=0 ; i--) { +for (i = n_descs -1 ; i >=0 ; i--) { s->pool[i] = i *XSK_UMEM__DEFAULT_FRAME_SIZE ; } s->n_pool = n_descs;
Signature · 1 line
2.47.0
Quoted 16 lines · Anastasia Belova
s->poolhasn_descselements so maximum i should ben_descs- 1. Fix the upper bound.Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes cb039ef3d9 ("net: add initial support for AF_XDP network backend")Signed-off-by Anastasia Belova <[email protected]>--- net/af-xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/af-xdp.c +0
-0
net/af-xdp.c static int af_xdp_umem_create(AFXDPState *s, int sock_fd, Error **errp) · line 329
Quoted 8 lines
net/af-xdp.c +1
-1@@ -323,7 +323,7 @@ static int af_xdp_umem_create(AFXDPState *s, int sock_fd, Error **errp) s->pool =g_new (uint64_t, n_descs);/* Fill the pool in the opposite order, because it's a LIFO queue. */ -for (i = n_descs; i >=0 ; i--) { +for (i = n_descs -1 ; i >=0 ; i--) { s->pool[i] = i *XSK_UMEM__DEFAULT_FRAME_SIZE ; } s->n_pool = n_descs;
As far as the fix goes:
The loop itself though doesn't do what the comment says it should be doing, but it's not related to this fix. I'll send a separate patch for that.
Ping?
Thanks,
/mjt
Quoted 33 lines · Ilya Maximets
Quoted 16 lines · Anastasia Belova
s->poolhasn_descselements so maximum i should ben_descs- 1. Fix the upper bound.Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes cb039ef3d9 ("net: add initial support for AF_XDP network backend")Signed-off-by Anastasia Belova <[email protected]>--- net/af-xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/af-xdp.c +0
-0net/af-xdp.c static int af_xdp_umem_create(AFXDPState *s, int sock_fd, Error **errp) · line 329
Quoted 8 lines
net/af-xdp.c +1
-1@@ -323,7 +323,7 @@ static int af_xdp_umem_create(AFXDPState *s, int sock_fd, Error **errp) s->pool =g_new (uint64_t, n_descs);/* Fill the pool in the opposite order, because it's a LIFO queue. */ -for (i = n_descs; i >=0 ; i--) { +for (i = n_descs -1 ; i >=0 ; i--) { s->pool[i] = i *XSK_UMEM__DEFAULT_FRAME_SIZE ; } s->n_pool = n_descs;As far as the fix goes:
Reviewed-by Ilya Maximets <[email protected]>The loop itself though doesn't do what the comment says it should be doing, but it's not related to this fix. I'll send a separate patch for that.
Quoted 26 lines · Anastasia Belova
s->poolhasn_descselements so maximum i should ben_descs- 1. Fix the upper bound.Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes cb039ef3d9 ("net: add initial support for AF_XDP network backend")Signed-off-by Anastasia Belova <[email protected]>--- net/af-xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/af-xdp.c +1
-2@@ -323,7 +323,7 @@ static int af_xdp_umem_create(AFXDPState *s, int sock_fd, Error **errp) s->pool =g_new (uint64_t, n_descs);/* Fill the pool in the opposite order, because it's a LIFO queue. */ -for (i = n_descs; i >=0 ; i--) { +for (i = n_descs -1 ; i >=0 ; i--) { s->pool[i] = i *XSK_UMEM__DEFAULT_FRAME_SIZE ; } s->n_pool = n_descs; --
Quoted 2 lines
2.47.0
Queued.
Thanks