]> git.dujemihanovic.xyz Git - linux.git/commit
rxrpc: Fix using alignmask being zero for __page_frag_alloc_align()
authorYunsheng Lin <linyunsheng@huawei.com>
Sun, 28 Apr 2024 11:16:38 +0000 (19:16 +0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 1 May 2024 01:30:43 +0000 (18:30 -0700)
commit9f8eeea1643c213c0e1ad2e546a15536200d216b
tree01122840aeefafa388129b6b082332beaa5d91a5
parentba1cb99b559e3b12db8b65ca9ff03358ea318064
rxrpc: Fix using alignmask being zero for __page_frag_alloc_align()

rxrpc_alloc_data_txbuf() may be called with data_align being
zero in none_alloc_txbuf() and rxkad_alloc_txbuf(), data_align
is supposed to be an order-based alignment value, but zero is
not a valid order-based alignment value, and '~(data_align - 1)'
doesn't result in a valid mask-based alignment value for
__page_frag_alloc_align().

Fix it by passing a valid order-based alignment value in
none_alloc_txbuf() and rxkad_alloc_txbuf().

Also use page_frag_alloc_align() expecting an order-based
alignment value in rxrpc_alloc_data_txbuf() to avoid doing the
alignment converting operation and to catch possible invalid
alignment value in the future. Remove the 'if (data_align)'
checking too, as it is always true for a valid order-based
alignment value.

Fixes: 6b2536462fd4 ("rxrpc: Fix use of changed alignment param to page_frag_alloc_align()")
Fixes: 49489bb03a50 ("rxrpc: Do zerocopy using MSG_SPLICE_PAGES and page frags")
CC: Alexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Acked-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20240428111640.27306-1-linyunsheng@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/rxrpc/insecure.c
net/rxrpc/rxkad.c
net/rxrpc/txbuf.c