From: David S. Miller Date: Tue, 11 Mar 2014 20:26:46 +0000 (-0400) Subject: Merge branch 'skb_frags' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c7b76f854e01cfdfdfaeb22b2ba1350be5d09ad7;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'skb_frags' Michael S. Tsirkin says: ==================== skbuff: fix skb_segment with zero copy skbs This fixes a bug in skb_segment where it moves frags between skbs without orphaning them. This causes userspace to assume it's safe to reuse the buffer, and receiver gets corrupted data. This further might leak information from the transmitter on the wire. To fix track which skb does a copied frag belong to, and orphan frags when copying them. As we are tracking multiple skbs here, using short names (skb,nskb,fskb,skb_frag,frag) becomes confusing. So before adding another one, I refactor these names slightly. Patch is split out to make it easier to verify that all trasformations are trivially correct. The problem was observed in the field, so I think that the patch is necessary on stable as well. ==================== Signed-off-by: David S. Miller Acked-by: Herbert Xu --- c7b76f854e01cfdfdfaeb22b2ba1350be5d09ad7