mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Move skb_has_shared_frag check out of GRE code and into segmentation

Browse source 
The call skb_has_shared_frag is used in the GRE path and skb_checksum_help
to verify that no frags can be modified by an external entity.  This check
really doesn't belong in the GRE path but in the skb_segment function
itself.  This way any protocol that might be segmented will be performing
this check before attempting to offload a checksum to software.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2016-02-05 15:27:55 -08:00 committed by David S. Miller
parent 08b64fcca9
commit ddff00d420
2 changed files with 5 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
net/core/skbuff.c
View file

@ -3173,6 +3173,11 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
perform_csum_check: perform_csum_check:
if (!csum) { if (!csum) {
if (skb_has_shared_frag(nskb)) {
err = __skb_linearize(nskb);
if (err)
goto err;
}
if (!nskb->remcsum_offload) if (!nskb->remcsum_offload)
nskb->ip_summed = CHECKSUM_NONE; nskb->ip_summed = CHECKSUM_NONE;
SKB_GSO_CB(nskb)->csum = SKB_GSO_CB(nskb)->csum =

11
net/ipv4/gre_offload.c
View file

@ -83,17 +83,6 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
if (csum) { if (csum) {
__be32 *pcsum; __be32 *pcsum;
if (skb_has_shared_frag(skb)) {
int err;
err = __skb_linearize(skb);
if (err) {
kfree_skb_list(segs);
segs = ERR_PTR(err);
goto out;
}
}
skb_reset_transport_header(skb); skb_reset_transport_header(skb);
greh = (struct gre_base_hdr *) greh = (struct gre_base_hdr *)