Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 02f1c89d6e36507476f78108a3dcc78538be460b

Authored by Paul Moore
Committed by David S. Miller
1 parent d8c9283089
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[NET]: Clone the sk_buff 'iif' field in __skb_clone() 

Both NetLabel and SELinux (other LSMs may grow to use it as well) rely
on the 'iif' field to determine the receiving network interface of
inbound packets.  Unfortunately, at present this field is not
preserved across a skb clone operation which can lead to garbage
values if the cloned skb is sent back through the network stack.  This
patch corrects this problem by properly copying the 'iif' field in
__skb_clone() and removing the 'iif' field assignment from
skb_act_clone() since it is no longer needed.

Also, while we are here, put the assignments in the same order as the
offsets to reduce cacheline bounces.

Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

include/net/sch_generic.h
Diff comments   View file @ 02f1c89
... ... @@ -325,7 +325,6 @@
325 325 n->tc_verd = SET_TC_VERD(n->tc_verd, 0);
326 326 n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd);
327 327 n->tc_verd = CLR_TC_MUNGED(n->tc_verd);
328   - n->iif = skb->iif;
329 328 }
330 329 return n;
331 330 }
... ... @@ -416,16 +416,17 @@
416 416 C(len);
417 417 C(data_len);
418 418 C(mac_len);
419   - n->cloned = 1;
420 419 n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;
  420 + n->cloned = 1;
421 421 n->nohdr = 0;
422 422 n->destructor = NULL;
423   - C(truesize);
424   - atomic_set(&n->users, 1);
425   - C(head);
426   - C(data);
  423 + C(iif);
427 424 C(tail);
428 425 C(end);
  426 + C(head);
  427 + C(data);
  428 + C(truesize);
  429 + atomic_set(&n->users, 1);
429 430  
430 431 atomic_inc(&(skb_shinfo(skb)->dataref));
431 432 skb->cloned = 1;