Skip to content

Commit ba965e8

Browse files
jpbruckergregkh
authored andcommitted
skbuff: fix coalescing for page_pool fragment recycling
[ Upstream commit 1effe8c ] Fix a use-after-free when using page_pool with page fragments. We encountered this problem during normal RX in the hns3 driver: (1) Initially we have three descriptors in the RX queue. The first one allocates PAGE1 through page_pool, and the other two allocate one half of PAGE2 each. Page references look like this: RX_BD1 _______ PAGE1 RX_BD2 _______ PAGE2 RX_BD3 _________/ (2) Handle RX on the first descriptor. Allocate SKB1, eventually added to the receive queue by tcp_queue_rcv(). (3) Handle RX on the second descriptor. Allocate SKB2 and pass it to netif_receive_skb(): netif_receive_skb(SKB2) ip_rcv(SKB2) SKB3 = skb_clone(SKB2) SKB2 and SKB3 share a reference to PAGE2 through skb_shinfo()->dataref. The other ref to PAGE2 is still held by RX_BD3: SKB2 ---+- PAGE2 SKB3 __/ / RX_BD3 _________/ (3b) Now while handling TCP, coalesce SKB3 with SKB1: tcp_v4_rcv(SKB3) tcp_try_coalesce(to=SKB1, from=SKB3) // succeeds kfree_skb_partial(SKB3) skb_release_data(SKB3) // drops one dataref SKB1 _____ PAGE1 \____ SKB2 _____ PAGE2 / RX_BD3 _________/ In skb_try_coalesce(), __skb_frag_ref() takes a page reference to PAGE2, where it should instead have increased the page_pool frag reference, pp_frag_count. Without coalescing, when releasing both SKB2 and SKB3, a single reference to PAGE2 would be dropped. Now when releasing SKB1 and SKB2, two references to PAGE2 will be dropped, resulting in underflow. (3c) Drop SKB2: af_packet_rcv(SKB2) consume_skb(SKB2) skb_release_data(SKB2) // drops second dataref page_pool_return_skb_page(PAGE2) // drops one pp_frag_count SKB1 _____ PAGE1 \____ PAGE2 / RX_BD3 _________/ (4) Userspace calls recvmsg() Copies SKB1 and releases it. Since SKB3 was coalesced with SKB1, we release the SKB3 page as well: tcp_eat_recv_skb(SKB1) skb_release_data(SKB1) page_pool_return_skb_page(PAGE1) page_pool_return_skb_page(PAGE2) // drops second pp_frag_count (5) PAGE2 is freed, but the third RX descriptor was still using it! In our case this causes IOMMU faults, but it would silently corrupt memory if the IOMMU was disabled. Change the logic that checks whether pp_recycle SKBs can be coalesced. We still reject differing pp_recycle between 'from' and 'to' SKBs, but in order to avoid the situation described above, we also reject coalescing when both 'from' and 'to' are pp_recycled and 'from' is cloned. The new logic allows coalescing a cloned pp_recycle SKB into a page refcounted one, because in this case the release (4) will drop the right reference, the one taken by skb_try_coalesce(). Fixes: 53e0961 ("page_pool: add frag page recycling support in page pool") Suggested-by: Alexander Duyck <[email protected]> Signed-off-by: Jean-Philippe Brucker <[email protected]> Reviewed-by: Yunsheng Lin <[email protected]> Reviewed-by: Alexander Duyck <[email protected]> Acked-by: Ilias Apalodimas <[email protected]> Acked-by: Jesper Dangaard Brouer <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 13bcc6f commit ba965e8

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

net/core/skbuff.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5390,11 +5390,18 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
53905390
if (skb_cloned(to))
53915391
return false;
53925392

5393-
/* The page pool signature of struct page will eventually figure out
5394-
* which pages can be recycled or not but for now let's prohibit slab
5395-
* allocated and page_pool allocated SKBs from being coalesced.
5393+
/* In general, avoid mixing slab allocated and page_pool allocated
5394+
* pages within the same SKB. However when @to is not pp_recycle and
5395+
* @from is cloned, we can transition frag pages from page_pool to
5396+
* reference counted.
5397+
*
5398+
* On the other hand, don't allow coalescing two pp_recycle SKBs if
5399+
* @from is cloned, in case the SKB is using page_pool fragment
5400+
* references (PP_FLAG_PAGE_FRAG). Since we only take full page
5401+
* references for cloned SKBs at the moment that would result in
5402+
* inconsistent reference counts.
53965403
*/
5397-
if (to->pp_recycle != from->pp_recycle)
5404+
if (to->pp_recycle != (from->pp_recycle && !skb_cloned(from)))
53985405
return false;
53995406

54005407
if (len <= skb_tailroom(to)) {

0 commit comments

Comments
 (0)