[PATCH] fix two bogus kfree(skb)

Patrick McHardy (kaber@trash.net)
Wed, 14 May 2003 17:29:29 +0200


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-25013-1052926295-0001-2
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

This patch fixes two occurences of kfree(skb) in net/bridge/br_input.c and
net/decnet/netfilter/dn_rtmsg.c.

Best regards,
Patrick

--=_courier-25013-1052926295-0001-2
Content-Type: text/plain; name="net-bogus-kfree.diff"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="net-bogus-kfree.diff"

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1114 -> 1.1115
# net/bridge/br_input.c 1.11 -> 1.12
# net/decnet/netfilter/dn_rtmsg.c 1.1 -> 1.2
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/14 kaber@trash.net 1.1115
# Fix bogus kfree in br_input.c and dn_rtmsg.c
# --------------------------------------------
#
diff -Nru a/net/bridge/br_input.c b/net/bridge/br_input.c
--- a/net/bridge/br_input.c Wed May 14 17:26:31 2003
+++ b/net/bridge/br_input.c Wed May 14 17:26:31 2003
@@ -64,7 +64,7 @@
smp_read_barrier_depends();

if (p == NULL || p->state == BR_STATE_DISABLED) {
- kfree(skb);
+ kfree_skb(skb);
goto out;
}

diff -Nru a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
--- a/net/decnet/netfilter/dn_rtmsg.c Wed May 14 17:26:31 2003
+++ b/net/decnet/netfilter/dn_rtmsg.c Wed May 14 17:26:31 2003
@@ -55,7 +55,7 @@

nlmsg_failure:
if (skb)
- kfree(skb);
+ kfree_skb(skb);
*errp = -ENOMEM;
if (net_ratelimit())
printk(KERN_ERR "dn_rtmsg: error creating netlink message\n");

--=_courier-25013-1052926295-0001-2--