diff options
| author | Konstantin Khlebnikov <koct9i@gmail.com> | 2016-01-08 13:21:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-15 20:35:24 +0100 |
| commit | 9207f9d45b0ad071baa128e846d7e7ed85016df3 (patch) | |
| tree | 9053fd455c6a19176174674e898ee05c37724827 /net/xfrm | |
| parent | fsl/fman: Delete one function call "put_device" in dtsec_config() (diff) | |
| download | linux-9207f9d45b0ad071baa128e846d7e7ed85016df3.tar.xz linux-9207f9d45b0ad071baa128e846d7e7ed85016df3.zip | |
net: preserve IP control block during GSO segmentation
Skb_gso_segment() uses skb control block during segmentation.
This patch adds 32-bytes room for previous control block which
will be copied into all resulting segments.
This patch fixes kernel crash during fragmenting forwarded packets.
Fragmentation requires valid IP CB in skb for clearing ip options.
Also patch removes custom save/restore in ovs code, now it's redundant.
Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
Link: http://lkml.kernel.org/r/CALYGNiP-0MZ-FExV2HutTvE9U-QQtkKSoE--KN=JQE5STYsjAA@mail.gmail.com
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index cc3676eb6239..ff4a91fcab9f 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -167,6 +167,8 @@ static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb { struct sk_buff *segs; + BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_SGO_CB_OFFSET); + BUILD_BUG_ON(sizeof(*IP6CB(skb)) > SKB_SGO_CB_OFFSET); segs = skb_gso_segment(skb, 0); kfree_skb(skb); if (IS_ERR(segs)) |