diff options
| author | David Howells <dhowells@redhat.com> | 2007-10-17 21:37:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-17 21:37:22 -0700 |
| commit | 45542479fb261342d5244869cf3ca4636b7ffd43 (patch) | |
| tree | 07a501f2b39561aa4cfde46a19a7648ddadfae95 /net | |
| parent | 13996378e6585fb25e582afe7489bf52dde78deb (diff) | |
| download | kernel_samsung_aries-45542479fb261342d5244869cf3ca4636b7ffd43.zip kernel_samsung_aries-45542479fb261342d5244869cf3ca4636b7ffd43.tar.gz kernel_samsung_aries-45542479fb261342d5244869cf3ca4636b7ffd43.tar.bz2 | |
[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>
Diffstat (limited to '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 453ae04..2143bf3 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, if (prev) { head = prev->next; fp = skb_clone(head, GFP_ATOMIC); - if (!fp) goto out_nomem; @@ -512,7 +511,6 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, goto out_oversize; /* Head of list must not be cloned. */ - err = -ENOMEM; if (skb_cloned(head) && pskb_expand_head(head, 0, 0, GFP_ATOMIC)) goto out_nomem; @@ -568,6 +566,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, out_nomem: LIMIT_NETDEBUG(KERN_ERR "IP: queue_glue: no memory for gluing " "queue %p\n", qp); + err = -ENOMEM; goto out_fail; out_oversize: if (net_ratelimit()) |