diff options
author | David Howells <dhowells@redhat.com> | 2007-10-18 00:37:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-18 00:37:22 -0400 |
commit | 45542479fb261342d5244869cf3ca4636b7ffd43 (patch) | |
tree | 07a501f2b39561aa4cfde46a19a7648ddadfae95 | |
parent | 13996378e6585fb25e582afe7489bf52dde78deb (diff) |
[NET]: Fix uninitialised variable in ip_frag_reasm()
Fix uninitialised variable in ip_frag_reasm(). err should be set to
-ENOMEM if the initial call of skb_clone() fails.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/ip_fragment.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 453ae041edde..2143bf30597a 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -486,7 +486,6 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, | |||
486 | if (prev) { | 486 | if (prev) { |
487 | head = prev->next; | 487 | head = prev->next; |
488 | fp = skb_clone(head, GFP_ATOMIC); | 488 | fp = skb_clone(head, GFP_ATOMIC); |
489 | |||
490 | if (!fp) | 489 | if (!fp) |
491 | goto out_nomem; | 490 | goto out_nomem; |
492 | 491 | ||
@@ -512,7 +511,6 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, | |||
512 | goto out_oversize; | 511 | goto out_oversize; |
513 | 512 | ||
514 | /* Head of list must not be cloned. */ | 513 | /* Head of list must not be cloned. */ |
515 | err = -ENOMEM; | ||
516 | if (skb_cloned(head) && pskb_expand_head(head, 0, 0, GFP_ATOMIC)) | 514 | if (skb_cloned(head) && pskb_expand_head(head, 0, 0, GFP_ATOMIC)) |
517 | goto out_nomem; | 515 | goto out_nomem; |
518 | 516 | ||
@@ -568,6 +566,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, | |||
568 | out_nomem: | 566 | out_nomem: |
569 | LIMIT_NETDEBUG(KERN_ERR "IP: queue_glue: no memory for gluing " | 567 | LIMIT_NETDEBUG(KERN_ERR "IP: queue_glue: no memory for gluing " |
570 | "queue %p\n", qp); | 568 | "queue %p\n", qp); |
569 | err = -ENOMEM; | ||
571 | goto out_fail; | 570 | goto out_fail; |
572 | out_oversize: | 571 | out_oversize: |
573 | if (net_ratelimit()) | 572 | if (net_ratelimit()) |