Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 924a4c7d authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

myri10ge: fix truesize underestimation 



skb->truesize must account for allocated memory, not the used part of
it. Doing this work is important to avoid unexpected OOM situations.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
CC: Jon Mason <mason@myri.com>
Acked-by: default avatarJon Mason <mason@myri.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b8b5961

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

+2 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,6 @@ myri10ge_rx_skb_build(struct sk_buff *skb, u8 * va, 
	struct skb_frag_struct *skb_frags;



	skb->len = skb->data_len = len;

	skb->truesize = len + sizeof(struct sk_buff);

	/* attach the page(s) */



	skb_frags = skb_shinfo(skb)->frags;
@@ -1385,6 +1384,8 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum, 
	if (skb_frag_size(&skb_shinfo(skb)->frags[0]) <= 0) {

		skb_frag_unref(skb, 0);

		skb_shinfo(skb)->nr_frags = 0;

	} else {

		skb->truesize += bytes * skb_shinfo(skb)->nr_frags;

	}

	skb->protocol = eth_type_trans(skb, dev);

	skb_record_rx_queue(skb, ss - &mgp->ss[0]);