lkml.org 
[lkml]   [1998]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subjectkfree_skb fixes...
Date

A number of missed kfree_skb changes.

--
Matthew Harrell If a tree falls in the forest and
Simulation Technology Division, SAIC crushes a mime, does anybody care?
mharrell@std.saic.com
diff -urN linux/net/ipv4/devinet.c-ori linux/net/ipv4/devinet.c
--- linux/net/ipv4/devinet.c-ori Wed Feb 11 10:03:04 1998
+++ linux/net/ipv4/devinet.c Wed Feb 11 10:03:48 1998
@@ -784,7 +784,7 @@
return;
}
if (inet_fill_ifaddr(skb, ifa, 0, 0, event) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
netlink_set_err(rtnl, 0, RTMGRP_IPV4_IFADDR, EINVAL);
return;
}
diff -urN linux/net/ipv4/fib_hash.c-ori linux/net/ipv4/fib_hash.c
--- linux/net/ipv4/fib_hash.c-ori Wed Feb 11 10:06:01 1998
+++ linux/net/ipv4/fib_hash.c Wed Feb 11 10:06:26 1998
@@ -715,7 +715,7 @@
if (fib_dump_info(skb, pid, n->nlmsg_seq, event, tb_id,
f->fn_type, f->fn_scope, &f->fn_key, z, f->fn_tos,
FIB_INFO(f)) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return;
}
NETLINK_CB(skb).dst_groups = RTMGRP_IPV4_ROUTE;
diff -urN linux/net/netlink/af_netlink.c-ori linux/net/netlink/af_netlink.c
--- linux/net/netlink/af_netlink.c-ori Wed Feb 11 10:08:03 1998
+++ linux/net/netlink/af_netlink.c Wed Feb 11 10:09:04 1998
@@ -370,7 +370,7 @@
if (nonblock) {
sti();
netlink_unlock(sk);
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return -EAGAIN;
}
interruptible_sleep_on(sk->sleep);
@@ -378,7 +378,7 @@
sti();

if (signal_pending(current)) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return -ERESTARTSYS;
}
goto retry;
@@ -392,7 +392,7 @@
netlink_unlock(sk);
return len;
}
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return -ECONNREFUSED;
}

@@ -466,8 +466,8 @@
netlink_unlock_table(protocol, allocation == GFP_KERNEL);

if (skb2)
- kfree_skb(skb2, 0);
- kfree_skb(skb, 0);
+ kfree_skb(skb2);
+ kfree_skb(skb);
}

void netlink_set_err(struct sock *ssk, pid_t pid, unsigned group, int code)
@@ -630,7 +630,7 @@
static void netlink_destroy_callback(struct netlink_callback *cb)
{
if (cb->skb)
- kfree_skb(cb->skb, 0);
+ kfree_skb(cb->skb);
kfree(cb);
}

diff -urN linux/net/ipv6/addrconf.c-ori linux/net/ipv6/addrconf.c
--- linux/net/ipv6/addrconf.c-ori Wed Feb 11 10:19:18 1998
+++ linux/net/ipv6/addrconf.c Wed Feb 11 10:19:32 1998
@@ -1530,7 +1530,7 @@
return;
}
if (inet6_fill_ifaddr(skb, ifa, 0, 0, event) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
netlink_set_err(rtnl, 0, RTMGRP_IPV6_IFADDR, EINVAL);
return;
}
diff -urN linux/net/ipv6/route.c-ori linux/net/ipv6/route.c
--- linux/net/ipv6/route.c-ori Wed Feb 11 10:35:41 1998
+++ linux/net/ipv6/route.c Wed Feb 11 10:35:57 1998
@@ -1749,7 +1749,7 @@
return;
}
if (rt6_fill_node(skb, rt, event, 0, 0) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
netlink_set_err(rtnl, 0, RTMGRP_IPV6_ROUTE, EINVAL);
return;
}
\
 
 \ /
  Last update: 2005-03-22 13:41    [from the cache]
©2003-2011 Jasper Spaans