crypto: Fix af_alg_sendmsg(MSG_SPLICE_PAGES) sglist limit
Subsystems (3)
PATCH 1/1 crypto: Fix af_alg_sendmsg(MSG_SPLICE_PAGES) sglist limit
When af_alg_sendmsg() calls extract_iter_to_sg(), it passes MAX_SGL_ENTS as the maximum number of elements that may be written to, but some of the elements may already have been used (as recorded in sgl->cur), so extract_iter_to_sg() may end up overrunning the scatterlist.
Fix this to limit the number of elements to "MAX_SGL_ENTS - sgl->cur".
Note: It probably makes sense in future to alter the behaviour of extract_iter_to_sg() to stop if "sgtable->nents >= sg_max" instead, but this is a smaller fix for now.
The bug causes errors looking something like:
BUG: KASAN: slab-out-of-bounds in sg_assign_page include/linux/scatterlist.h:109 [inline] BUG: KASAN: slab-out-of-bounds in sg_set_page include/linux/scatterlist.h:139 [inline] BUG: KASAN: slab-out-of-bounds in extract_bvec_to_sg lib/scatterlist.c:1183 [inline] BUG: KASAN: slab-out-of-bounds in extract_iter_to_sg lib/scatterlist.c:1352 [inline] BUG: KASAN: slab-out-of-bounds in extract_iter_to_sg+0x17a6/0x1960 lib/scatterlist.c:1339
--- crypto/af_alg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/af_alg.c +1 -1
@@ -1043,7 +1043,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, }; plen =extract_iter_to_sg (&msg->msg_iter, len, &sgtable, -MAX_SGL_ENTS ,0 ); +MAX_SGL_ENTS - sgl->cur,0 );if (plen <0 ) { err = plen; goto unlock;
Quoted 33 lines · David Howells
When
af_alg_sendmsg()callsextract_iter_to_sg(), it passesMAX_SGL_ENTSas the maximum number of elements that may be written to, but some of the elements may already have been used (as recorded insgl->cur), soextract_iter_to_sg()may end up overrunning the scatterlist.Fix this to limit the number of elements to "
MAX_SGL_ENTS-sgl->cur".Note: It probably makes sense in future to alter the behaviour of
extract_iter_to_sg()to stop if "sgtable->nents>=sg_max" instead, but this is a smaller fix for now.The bug causes errors looking something like:
BUG: KASAN: slab-out-of-bounds in sg_assign_page include/linux/scatterlist.h:109 [inline] BUG: KASAN: slab-out-of-bounds in sg_set_page include/linux/scatterlist.h:139 [inline] BUG: KASAN: slab-out-of-bounds in extract_bvec_to_sg lib/scatterlist.c:1183 [inline] BUG: KASAN: slab-out-of-bounds in extract_iter_to_sg lib/scatterlist.c:1352 [inline] BUG: KASAN: slab-out-of-bounds in extract_iter_to_sg+0x17a6/0x1960 lib/scatterlist.c:1339Fixes bf63e250c4b1 ("crypto: af_alg: Support MSG_SPLICE_PAGES")Reported-by [email protected]Signed-off-by David Howells <[email protected]>Tested-by [email protected]cc Herbert Xu <[email protected]>cc "David S. Miller" <[email protected]>cc Eric Dumazet <[email protected]>cc Jakub Kicinski <[email protected]>cc Paolo Abeni <[email protected]>cc Jens Axboe <[email protected]>cc Matthew Wilcox <[email protected]>
Quoted 3 lines
--- crypto/af_alg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 15 Jun 2023 22:08:54 +0100 you wrote:
When
af_alg_sendmsg()callsextract_iter_to_sg(), it passesMAX_SGL_ENTSas the maximum number of elements that may be written to, but some of the elements may already have been used (as recorded insgl->cur), soextract_iter_to_sg()may end up overrunning the scatterlist.Fix this to limit the number of elements to "
MAX_SGL_ENTS-sgl->cur".[...]
Here is the summary with links:
- [net-next] crypto: Fix af_alg_sendmsg(MSG_SPLICE_PAGES) sglist limit
https://git.kernel.org/netdev/net-next/c/4380499218c6
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html