Skip to contentSkip to conversation

Linux 2.6.20.3

DISCUSSION Greg KH 5 participants 11 messages Mar 13, 2007 – Mar 14, 2007

Subsystems (11)
Networking Network drivers SCSI USB +7 more subsystems
lore
Share & tools
lore

Greg KH

author
#0 lore raw

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.20.2 and 2.6.20.3.

The updated 2.6.20.y git tree can be found at:

        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git

and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/

thanks,

greg k-h
--------

 Makefile                                         |    2 
 arch/sparc/kernel/of_device.c                    |    7 
 arch/sparc64/kernel/of_device.c                  |    7 
 drivers/connector/connector.c                    |   22 +-
 drivers/net/wireless/bcm43xx/bcm43xx.h           |    1 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c       |  171 ++++++++++++++++-------
 drivers/scsi/scsi_debug.c                        |   12 +
 drivers/usb/serial/keyspan.c                     |   49 ++++++
 include/linux/netfilter_ipv4/ip_conntrack_core.h |    2 
 include/net/inet_timewait_sock.h                 |    2 
 include/net/netfilter/nf_conntrack_core.h        |    2 
 net/core/sock.c                                  |    2 
 net/ipv4/netfilter/ip_conntrack_core.c           |    2 
 net/ipv4/netfilter/ip_conntrack_proto_tcp.c      |    4 
 net/ipv4/netfilter/nf_nat_core.c                 |    3 
 net/ipv4/netfilter/nf_nat_proto_gre.c            |    3 
 net/ipv4/netfilter/nf_nat_proto_icmp.c           |    3 
 net/ipv4/netfilter/nf_nat_proto_tcp.c            |    3 
 net/ipv4/netfilter/nf_nat_proto_udp.c            |    3 
 net/ipv4/udp.c                                   |    1 
 net/ipv6/netfilter.c                             |    1 
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c   |    1 
 net/netfilter/nf_conntrack_core.c                |    2 
 net/netfilter/nf_conntrack_proto_gre.c           |    3 
 net/netfilter/nf_conntrack_proto_tcp.c           |    4 
 net/netfilter/nfnetlink_log.c                    |   18 +-
 26 files changed, 232 insertions(+), 98 deletions(-)

Summary of changes from v2.6.20.2 to v2.6.20.3
==============================================

David Miller (1):
Fix sparc64 device register probing

Douglas Gilbert (1):
Fix bug 7994 sleeping function called from invalid context

Eric Dumazet (1):
Fix timewait jiffies

Greg Kroah-Hartman (1):

      Linux 2.6.20.3

Herbert Xu (1):
Fix UDP header pointer after pskb_trim_rcsum()

Johannes Berg (1):
Fix compat_getsockopt

Larry Finger (1):
bcm43xx: Fix problem with >1 GB RAM

Micha Mirosaw (1):
nfnetlink_log: fix NULL pointer dereference

Michal Miroslaw (1):
nfnetlink_log: fix possible NULL pointer dereference

Patrick McHardy (8):
conntrack: fix {nf, ip}_ct_iterate_cleanup endless loops nf_conntrack/nf_nat: fix incorrect config ifdefs
tcp conntrack: accept SYN|URG as valid
nfnetlink_log: fix reference leak
nfnetlink_log: fix use after free
nf_conntrack: fix incorrect classification of IPv6 fragments as ESTABLISHED
nfnetlink_log: zero-terminate prefix
nfnetlink_log: fix crash on bridged packet

Philipp Reisner (1):
Fix callback bug in connector

Rainer Weikusat (1):
fix for bugzilla #7544 (keyspan USB-to-serial converter)

Yasuyuki Kozakai (1):
ip6_route_me_harder should take into account mark

author
#1 lore raw
Makefile +1 -1
index d165e80..7d2f304 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .2
+EXTRAVERSION = .3
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
arch/sparc/kernel/of_device.c +4 -3
index dab6169..798b140 100644
@@ -495,7 +495,7 @@ static void __init build_device_resources(struct of_device *op,
 		u32 *reg = (preg + (index * ((na + ns) * 4)));
 		struct device_node *dp = op->node;
 		struct device_node *pp = p_op->node;
-		struct of_bus *pbus;
+		struct of_bus *pbus, *dbus;
 		u64 size, result = OF_BAD_ADDR;
 		unsigned long flags;
 		int dna, dns;
@@ -516,6 +516,7 @@ static void __init build_device_resources(struct of_device *op,
 
 		dna = na;
 		dns = ns;
+		dbus = bus;
 
 		while (1) {
 			dp = pp;
@@ -528,13 +529,13 @@ static void __init build_device_resources(struct of_device *op,
 			pbus = of_match_bus(pp);
 			pbus->count_cells(dp, &pna, &pns);
 
-			if (build_one_resource(dp, bus, pbus, addr,
+			if (build_one_resource(dp, dbus, pbus, addr,
 					       dna, dns, pna))
 				break;
 
 			dna = pna;
 			dns = pns;
-			bus = pbus;
+			dbus = pbus;
 		}
 
 	build_res:
arch/sparc64/kernel/of_device.c +4 -3
index ad74e5e..1f45985 100644
@@ -581,7 +581,7 @@ static void __init build_device_resources(struct of_device *op,
 		u32 *reg = (preg + (index * ((na + ns) * 4)));
 		struct device_node *dp = op->node;
 		struct device_node *pp = p_op->node;
-		struct of_bus *pbus;
+		struct of_bus *pbus, *dbus;
 		u64 size, result = OF_BAD_ADDR;
 		unsigned long flags;
 		int dna, dns;
@@ -599,6 +599,7 @@ static void __init build_device_resources(struct of_device *op,
 
 		dna = na;
 		dns = ns;
+		dbus = bus;
 
 		while (1) {
 			dp = pp;
@@ -611,13 +612,13 @@ static void __init build_device_resources(struct of_device *op,
 			pbus = of_match_bus(pp);
 			pbus->count_cells(dp, &pna, &pns);
 
-			if (build_one_resource(dp, bus, pbus, addr,
+			if (build_one_resource(dp, dbus, pbus, addr,
 					       dna, dns, pna))
 				break;
 
 			dna = pna;
 			dns = pns;
-			bus = pbus;
+			dbus = pbus;
 		}
 
 	build_res:
drivers/connector/connector.c +11 -11
index a44db75..a905f78 100644
@@ -128,7 +128,7 @@ EXPORT_SYMBOL_GPL(cn_netlink_send);
  */
 static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), void *data)
 {
-	struct cn_callback_entry *__cbq;
+	struct cn_callback_entry *__cbq, *__new_cbq;
 	struct cn_dev *dev = &cdev;
 	int err = -ENODEV;
 
@@ -148,27 +148,27 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
 			} else {
 				struct cn_callback_data *d;
 				
-				__cbq = kzalloc(sizeof(*__cbq), GFP_ATOMIC);
-				if (__cbq) {
-					d = &__cbq->data;
+				err = -ENOMEM;
+				__new_cbq = kzalloc(sizeof(struct cn_callback_entry), GFP_ATOMIC);
+				if (__new_cbq) {
+					d = &__new_cbq->data;
 					d->callback_priv = msg;
 					d->callback = __cbq->data.callback;
 					d->ddata = data;
 					d->destruct_data = destruct_data;
-					d->free = __cbq;
+					d->free = __new_cbq;
 
-					INIT_WORK(&__cbq->work,
+					INIT_WORK(&__new_cbq->work,
 							&cn_queue_wrapper);
-					
+
 					if (queue_work(dev->cbdev->cn_queue,
-						    &__cbq->work))
+						    &__new_cbq->work))
 						err = 0;
 					else {
-						kfree(__cbq);
+						kfree(__new_cbq);
 						err = -EINVAL;
 					}
-				} else
-					err = -ENOMEM;
+				}
 			}
 			break;
 		}
drivers/net/wireless/bcm43xx/bcm43xx.h +1 -0
index 02ad9b1..38ea6b9 100644
@@ -766,6 +766,7 @@ struct bcm43xx_private {
 	 * This is currently always BCM43xx_BUSTYPE_PCI
 	 */
 	u8 bustype;
+	u64 dma_mask;
 
 	u16 board_vendor;
 	u16 board_type;
drivers/net/wireless/bcm43xx/bcm43xx_dma.c +124 -47

259 lines not on this page · raw message

drivers/scsi/scsi_debug.c +9 -3
index 30ee3d7..614c2c9 100644
@@ -954,7 +954,9 @@ static int resp_inquiry(struct scsi_cmnd * scp, int target,
 	int alloc_len, n, ret;
 
 	alloc_len = (cmd[3] << 8) + cmd[4];
-	arr = kzalloc(SDEBUG_MAX_INQ_ARR_SZ, GFP_KERNEL);
+	arr = kzalloc(SDEBUG_MAX_INQ_ARR_SZ, GFP_ATOMIC);
+	if (! arr)
+		return DID_REQUEUE << 16;
 	if (devip->wlun)
 		pq_pdt = 0x1e;	/* present, wlun */
 	else if (scsi_debug_no_lun_0 && (0 == devip->lun))
@@ -1217,7 +1219,9 @@ static int resp_report_tgtpgs(struct scsi_cmnd * scp,
 	alen = ((cmd[6] << 24) + (cmd[7] << 16) + (cmd[8] << 8)
 		+ cmd[9]);
 
-	arr = kzalloc(SDEBUG_MAX_TGTPGS_ARR_SZ, GFP_KERNEL);
+	arr = kzalloc(SDEBUG_MAX_TGTPGS_ARR_SZ, GFP_ATOMIC);
+	if (! arr)
+		return DID_REQUEUE << 16;
 	/*
 	 * EVPD page 0x88 states we have two ports, one
 	 * real and a fake port with no device connected.
@@ -1996,6 +2000,8 @@ static int scsi_debug_slave_configure(struct scsi_device * sdp)
 	if (sdp->host->max_cmd_len != SCSI_DEBUG_MAX_CMD_LEN)
 		sdp->host->max_cmd_len = SCSI_DEBUG_MAX_CMD_LEN;
 	devip = devInfoReg(sdp);
+	if (NULL == devip)
+		return 1;       /* no resources, will be marked offline */
 	sdp->hostdata = devip;
 	if (sdp->host->cmd_per_lun)
 		scsi_adjust_queue_depth(sdp, SDEBUG_TAGGED_QUEUING,
@@ -2044,7 +2050,7 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev)
 		}
 	}
 	if (NULL == open_devip) { /* try and make a new one */
-		open_devip = kzalloc(sizeof(*open_devip),GFP_KERNEL);
+		open_devip = kzalloc(sizeof(*open_devip),GFP_ATOMIC);
 		if (NULL == open_devip) {
 			printk(KERN_ERR "%s: out of memory at line %d\n",
 				__FUNCTION__, __LINE__);
drivers/usb/serial/keyspan.c +45 -4

67 lines not on this page · raw message

include/linux/netfilter_ipv4/ip_conntrack_core.h +1 -1
index 907d4f5..e3a6df0 100644
@@ -45,7 +45,7 @@ static inline int ip_conntrack_confirm(struct sk_buff **pskb)
 	int ret = NF_ACCEPT;
 
 	if (ct) {
-		if (!is_confirmed(ct))
+		if (!is_confirmed(ct) && !is_dying(ct))
 			ret = __ip_conntrack_confirm(pskb);
 		ip_ct_deliver_cached_events(ct);
 	}
include/net/inet_timewait_sock.h +1 -1
index f7be1ac..09a2532 100644
@@ -66,7 +66,7 @@ struct inet_hashinfo;
 struct inet_timewait_death_row {
 	/* Short-time timewait calendar */
 	int			twcal_hand;
-	int			twcal_jiffie;
+	unsigned long		twcal_jiffie;
 	struct timer_list	twcal_timer;
 	struct hlist_head	twcal_row[INET_TWDR_RECYCLE_SLOTS];
 
include/net/netfilter/nf_conntrack_core.h +1 -1
index 7fdc72c..85634e1 100644
@@ -64,7 +64,7 @@ static inline int nf_conntrack_confirm(struct sk_buff **pskb)
 	int ret = NF_ACCEPT;
 
 	if (ct) {
-		if (!nf_ct_is_confirmed(ct))
+		if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct))
 			ret = __nf_conntrack_confirm(pskb);
 		nf_ct_deliver_cached_events(ct);
 	}
net/core/sock.c +1 -1
index 0ed5b4f..b69192b 100644
@@ -1597,7 +1597,7 @@ int compat_sock_common_getsockopt(struct socket *sock, int level, int optname,
 {
 	struct sock *sk = sock->sk;
 
-	if (sk->sk_prot->compat_setsockopt != NULL)
+	if (sk->sk_prot->compat_getsockopt != NULL)
 		return sk->sk_prot->compat_getsockopt(sk, level, optname,
 						      optval, optlen);
 	return sk->sk_prot->getsockopt(sk, level, optname, optval, optlen);
net/ipv4/netfilter/ip_conntrack_core.c +1 -1
index 8556a4f..f8b3009 100644
@@ -1242,7 +1242,7 @@ get_next_corpse(int (*iter)(struct ip_conntrack *i, void *data),
 	list_for_each_entry(h, &unconfirmed, list) {
 		ct = tuplehash_to_ctrack(h);
 		if (iter(ct, data))
-			goto found;
+			set_bit(IPS_DYING_BIT, &ct->status);
 	}
 	write_unlock_bh(&ip_conntrack_lock);
 	return NULL;
net/ipv4/netfilter/ip_conntrack_proto_tcp.c +3 -1
index 06e4e8a..4cd76ed 100644
@@ -821,8 +821,10 @@ void ip_conntrack_tcp_update(struct sk_buff *skb,
 static const u8 tcp_valid_flags[(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG) + 1] =
 {
 	[TH_SYN]			= 1,
-	[TH_SYN|TH_ACK]			= 1,
 	[TH_SYN|TH_PUSH]		= 1,
+	[TH_SYN|TH_URG]			= 1,
+	[TH_SYN|TH_PUSH|TH_URG]		= 1,
+	[TH_SYN|TH_ACK]			= 1,
 	[TH_SYN|TH_ACK|TH_PUSH]		= 1,
 	[TH_RST]			= 1,
 	[TH_RST|TH_ACK]			= 1,
net/ipv4/netfilter/nf_nat_core.c +1 -2
index 86a9227..8de7188 100644
@@ -540,8 +540,7 @@ void nf_nat_protocol_unregister(struct nf_nat_protocol *proto)
 }
 EXPORT_SYMBOL(nf_nat_protocol_unregister);
 
-#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
-    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 int
 nf_nat_port_range_to_nfattr(struct sk_buff *skb,
 			    const struct nf_nat_range *range)
net/ipv4/netfilter/nf_nat_proto_gre.c +1 -2
index d3de579..e5a34c1 100644
@@ -152,8 +152,7 @@ static struct nf_nat_protocol gre __read_mostly = {
 	.manip_pkt		= gre_manip_pkt,
 	.in_range		= gre_in_range,
 	.unique_tuple		= gre_unique_tuple,
-#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
-    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 	.range_to_nfattr	= nf_nat_port_range_to_nfattr,
 	.nfattr_to_range	= nf_nat_port_nfattr_to_range,
 #endif
net/ipv4/netfilter/nf_nat_proto_icmp.c +1 -2
index dcfd772..b93c78a 100644
@@ -78,8 +78,7 @@ struct nf_nat_protocol nf_nat_protocol_icmp = {
 	.manip_pkt		= icmp_manip_pkt,
 	.in_range		= icmp_in_range,
 	.unique_tuple		= icmp_unique_tuple,
-#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
-    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 	.range_to_nfattr	= nf_nat_port_range_to_nfattr,
 	.nfattr_to_range	= nf_nat_port_nfattr_to_range,
 #endif
net/ipv4/netfilter/nf_nat_proto_tcp.c +1 -2
index 7e26a7e..f6b99d6 100644
@@ -140,8 +140,7 @@ struct nf_nat_protocol nf_nat_protocol_tcp = {
 	.manip_pkt		= tcp_manip_pkt,
 	.in_range		= tcp_in_range,
 	.unique_tuple		= tcp_unique_tuple,
-#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
-    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 	.range_to_nfattr	= nf_nat_port_range_to_nfattr,
 	.nfattr_to_range	= nf_nat_port_nfattr_to_range,
 #endif
net/ipv4/netfilter/nf_nat_proto_udp.c +1 -2
index ab0ce4c..c00ab6e 100644
@@ -130,8 +130,7 @@ struct nf_nat_protocol nf_nat_protocol_udp = {
 	.manip_pkt		= udp_manip_pkt,
 	.in_range		= udp_in_range,
 	.unique_tuple		= udp_unique_tuple,
-#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
-    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 	.range_to_nfattr	= nf_nat_port_range_to_nfattr,
 	.nfattr_to_range	= nf_nat_port_nfattr_to_range,
 #endif
net/ipv4/udp.c +1 -0
index cfff930..f8068b0 100644
@@ -1214,6 +1214,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 
 		if (ulen < sizeof(*uh) || pskb_trim_rcsum(skb, ulen))
 			goto short_packet;
+		uh = skb->h.uh;
 
 		udp4_csum_init(skb, uh);
 
net/ipv6/netfilter.c +1 -0
index f6294e5..ca50b58 100644
@@ -15,6 +15,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
 	struct dst_entry *dst;
 	struct flowi fl = {
 		.oif = skb->sk ? skb->sk->sk_bound_dev_if : 0,
+		.mark = skb->mark,
 		.nl_u =
 		{ .ip6_u =
 		  { .daddr = iph->daddr,
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +1 -0
index a20615f..6155b80 100644
@@ -257,6 +257,7 @@ static unsigned int ipv6_conntrack_in(unsigned int hooknum,
 		}
 		nf_conntrack_get(reasm->nfct);
 		(*pskb)->nfct = reasm->nfct;
+		(*pskb)->nfctinfo = reasm->nfctinfo;
 		return NF_ACCEPT;
 	}
 
net/netfilter/nf_conntrack_core.c +1 -1
index 9b02ec4..cb29ba7 100644
@@ -1052,7 +1052,7 @@ get_next_corpse(int (*iter)(struct nf_conn *i, void *data),
 	list_for_each_entry(h, &unconfirmed, list) {
 		ct = nf_ct_tuplehash_to_ctrack(h);
 		if (iter(ct, data))
-			goto found;
+			set_bit(IPS_DYING_BIT, &ct->status);
 	}
 	write_unlock_bh(&nf_conntrack_lock);
 	return NULL;
net/netfilter/nf_conntrack_proto_gre.c +1 -2
index ac193ce..5434472 100644
@@ -281,8 +281,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
 	.new		 = gre_new,
 	.destroy	 = gre_destroy,
 	.me 		 = THIS_MODULE,
-#if defined(CONFIG_NF_CONNTRACK_NETLINK) || \
-    defined(CONFIG_NF_CONNTRACK_NETLINK_MODULE)
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 	.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr,
 	.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple,
 #endif
net/netfilter/nf_conntrack_proto_tcp.c +3 -1
index 626b001..693d189 100644
@@ -778,8 +778,10 @@ EXPORT_SYMBOL_GPL(nf_conntrack_tcp_update);
 static u8 tcp_valid_flags[(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG) + 1] =
 {
 	[TH_SYN]			= 1,
-	[TH_SYN|TH_ACK]			= 1,
 	[TH_SYN|TH_PUSH]		= 1,
+	[TH_SYN|TH_URG]			= 1,
+	[TH_SYN|TH_PUSH|TH_URG]		= 1,
+	[TH_SYN|TH_ACK]			= 1,
 	[TH_SYN|TH_ACK|TH_PUSH]		= 1,
 	[TH_RST]			= 1,
 	[TH_RST|TH_ACK]			= 1,
net/netfilter/nfnetlink_log.c +12 -6
index 24c1d29..690b173 100644
@@ -397,8 +397,8 @@ static void nfulnl_timer(unsigned long data)
 	if (timer_pending(&inst->timer))	/* is it always true or false here? */
 		del_timer(&inst->timer);
 	__nfulnl_send(inst);
-	instance_put(inst);
 	spin_unlock_bh(&inst->lock);
+	instance_put(inst);
 }
 
 /* This is an inline function, we don't really care about a long
@@ -491,7 +491,7 @@ __build_packet_message(struct nfulnl_instance *inst,
 			 * for physical device (when called from ipv4) */
 			NFA_PUT(inst->skb, NFULA_IFINDEX_OUTDEV,
 				sizeof(tmp_uint), &tmp_uint);
-			if (skb->nf_bridge) {
+			if (skb->nf_bridge && skb->nf_bridge->physoutdev) {
 				tmp_uint = 
 				    htonl(skb->nf_bridge->physoutdev->ifindex);
 				NFA_PUT(inst->skb, NFULA_IFINDEX_PHYSOUTDEV,
@@ -564,6 +564,7 @@ __build_packet_message(struct nfulnl_instance *inst,
 	}
 		
 	nlh->nlmsg_len = inst->skb->tail - old_tail;
+	inst->lastnlh = nlh;
 	return 0;
 
 nlmsg_failure:
@@ -619,7 +620,7 @@ nfulnl_log_packet(unsigned int pf,
 
 	plen = 0;
 	if (prefix)
-		plen = strlen(prefix);
+		plen = strlen(prefix) + 1;
 
 	/* all macros expand to constant values at compile time */
 	/* FIXME: do we want to make the size calculation conditional based on
@@ -720,15 +721,16 @@ nfulnl_log_packet(unsigned int pf,
 		inst->timer.expires = jiffies + (inst->flushtimeout*HZ/100);
 		add_timer(&inst->timer);
 	}
-	spin_unlock_bh(&inst->lock);
 
+unlock_and_release:
+	spin_unlock_bh(&inst->lock);
+	instance_put(inst);
 	return;
 
 alloc_failure:
-	spin_unlock_bh(&inst->lock);
-	instance_put(inst);
 	UDEBUG("error allocating skb\n");
 	/* FIXME: statistics */
+	goto unlock_and_release;
 }
 
 static int
@@ -865,6 +867,9 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
 			ret = -EINVAL;
 			break;
 		}
+
+		if (!inst)
+			goto out;
 	} else {
 		if (!inst) {
 			UDEBUG("no config command, and no instance for "
@@ -918,6 +923,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
 
 out_put:
 	instance_put(inst);
+out:
 	return ret;
 }
 
#2 lore raw
In reply to Greg KH
Quoted 8 lines · Greg KH

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.20.2 and 2.6.20.3.

Compared to 2.6.20.1 (will try 2.6.20.2 as well), I now get:

[  199.361347] BUG: soft lockup detected on CPU#2!
smp_percpu_timer_interrupt+0xd4/0x180
tl0_irq14+0x1c/0x20
journal_add_journal_head+0x2c/0x1e0
journal_write_metadata_buffer+0x480/0x500
journal_commit_transaction+0xc38/0x1040
kjournald+0xc0/0x1e0
kthread+0xb0/0xc0
kernel_thread+0x38/0x60
keventd_create_kthread+0x20/0xa0

shortly after the serial console prompts for login.

Thanks,
Nish

#3 lore raw
Quoted 11 lines · Nish Aravamudan
Quoted 8 lines · Greg KH

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.20.2 and 2.6.20.3.

Compared to 2.6.20.1 (will try 2.6.20.2 as well), I now get:

err, duh -- this is a Sun Ultra 60, debian testing install.

Thanks,
Nish

maintainer
#4 lore raw

From: "Nish Aravamudan" <[email protected]>
Date: Tue, 13 Mar 2007 14:58:24 -0700

Quoted 6 lines · Nish Aravamudan
Quoted 5 lines · Greg KH
Quoted 4 lines

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.20.2 and 2.6.20.3.

Compared to 2.6.20.1 (will try 2.6.20.2 as well), I now get:

err, duh -- this is a Sun Ultra 60, debian testing install.

Figure out if 2.6.20.2 does it too, then please try to git bisect it down further.

I took a quick look and the two sparc64 commits between 2.6.20.1 and 2.6.20.2 are benign, a fix for E450 interrupts and a kenvctrld fix which is for a driver for hardware your ultra60 doesn't have. :)

There is a decent amount of raid and nfs fixes in here, do you use either?

Another commit that might be relevant is:

commit 530b09160744a12450fdacb2b78779c9830a29c8

Author: Aristeu Sergio Rozanski Filho <[email protected]>
Date:   Thu Mar 1 19:02:55 2007 -0500

tty_io: fix race in master pty close/slave pty close path

Hmmm...

Please let us know if you can narrow it down further.

#5 lore raw
Quoted 14 lines · David Miller

From: "Nish Aravamudan" <[email protected]>
Date: Tue, 13 Mar 2007 14:58:24 -0700

Quoted 11 lines · Nish Aravamudan
Quoted 10 lines · Greg KH
Quoted 8 lines

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.20.2 and 2.6.20.3.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Compared to 2.6.20.1 (will try 2.6.20.2 as well), I now get:

err, duh -- this is a Sun Ultra 60, debian testing install.

Figure out if 2.6.20.2 does it too, then please try to git bisect it down further.

Yep, that's the plan, just wanted to make folks aware.

Quoted 6 lines

I took a quick look and the two sparc64 commits between 2.6.20.1 and 2.6.20.2 are benign, a fix for E450 interrupts and a kenvctrld fix which is for a driver for hardware your ultra60 doesn't have. :)

There is a decent amount of raid and nfs fixes in here, do you use either?

Neither.

Quoted 11 lines

Another commit that might be relevant is:

commit 530b09160744a12450fdacb2b78779c9830a29c8

Author: Aristeu Sergio Rozanski Filho <[email protected]>
Date:   Thu Mar 1 19:02:55 2007 -0500

tty_io: fix race in master pty close/slave pty close path

Hmmm...

Please let us know if you can narrow it down further.

Building 2.6.20.2 right now, will let you know.

Thanks,
Nish

#6 lore raw
Quoted 39 lines · Nish Aravamudan
Quoted 14 lines · David Miller

From: "Nish Aravamudan" <[email protected]>
Date: Tue, 13 Mar 2007 14:58:24 -0700

Quoted 11 lines · Nish Aravamudan
Quoted 10 lines · Greg KH
Quoted 8 lines

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.20.2 and 2.6.20.3.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Compared to 2.6.20.1 (will try 2.6.20.2 as well), I now get:

err, duh -- this is a Sun Ultra 60, debian testing install.

Figure out if 2.6.20.2 does it too, then please try to git bisect it down further.

Yep, that's the plan, just wanted to make folks aware.

Quoted 6 lines

I took a quick look and the two sparc64 commits between 2.6.20.1 and 2.6.20.2 are benign, a fix for E450 interrupts and a kenvctrld fix which is for a driver for hardware your ultra60 doesn't have. :)

There is a decent amount of raid and nfs fixes in here, do you use either?

Neither.

Quoted 6 lines

Another commit that might be relevant is:

commit 530b09160744a12450fdacb2b78779c9830a29c8

Author: Aristeu Sergio Rozanski Filho <[email protected]>
Date:   Thu Mar 1 19:02:55 2007 -0500
Quoted 7 lines
Quoted 5 lines

tty_io: fix race in master pty close/slave pty close path

Hmmm...

Please let us know if you can narrow it down further.

Building 2.6.20.2 right now, will let you know.

Ok, truly bizarre, I found that I was not running stock 2.6.20.3, but had your small hugetlb patch on top.

So I went back and patched 2.6.20.1 with your patch, rebooted, got a soft lockup. Went back to stock 2.6.20.1 and did not.

I don't see how your patch (C&P below for reference) could make any difference...Especially because no hugepages were in use at the time. On patched 2.6.20.1, I was just trying to check if my source tree had your patch applied (by patch -p1 < davem.patch) and got the soft-lockup I saw in 2.6.20.3 with the patch applied. I am going to try a clean 2.6.20.3 as well, now.

arch/sparc64/mm/hugetlbpage.c +0 -0
index 33fd0b2..00677b5 100644
@@ -248,6 +248,7 @@ void set_huge_pte_at(struct mm_struct *mm,

unsigned long addr,

        if (!pte_present(*ptep) && pte_present(entry))
                mm->context.huge_pte_count++;
+       addr &= HPAGE_MASK;
        for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
                set_pte_at(mm, addr, ptep, entry);
                ptep++;
@@ -266,6 +267,8 @@ pte_t huge_ptep_get_and_clear(struct mm_struct
*mm, unsigned long addr,
        if (pte_present(entry))
                mm->context.huge_pte_count--;

+ addr &= HPAGE_MASK;
+

        for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
                pte_clear(mm, addr, ptep);
                addr += PAGE_SIZE;
#10 lore raw
In reply to Greg KH

many changes since 2.6.20.3-rc1?

Quoted 5 lines · Greg KH

We (the -stable team) are announcing the release of the 2.6.20.3 kernel. It contains a number of bugfixes and all 2.6.20 users are recommended to upgrade.

The diffstat and short summary of the fixes are below.

#7 lore raw
In reply to Nish Aravamudan
Quoted 10 lines · Nish Aravamudan

Ok, truly bizarre, I found that I was not running stock 2.6.20.3, but had your small hugetlb patch on top.
So I went back and patched 2.6.20.1 with your patch, rebooted, got a soft lockup. Went back to stock 2.6.20.1 and did not.
I don't see how your patch (C&P below for reference) could make any difference...Especially because no hugepages were in use at the time. On patched 2.6.20.1, I was just trying to check if my source tree had your patch applied (by patch -p1 < davem.patch) and got the soft-lockup I saw in 2.6.20.3 with the patch applied. I am going to try a clean 2.6.20.3 as well, now.

I'm still trying to get on this.

-- wli

maintainer
#9 lore raw
In reply to Nish Aravamudan

From: "Nish Aravamudan" <[email protected]>
Date: Tue, 13 Mar 2007 17:29:17 -0700

Quoted 6 lines

Ok, truly bizarre, I found that I was not running stock 2.6.20.3, but had your small hugetlb patch on top.

So I went back and patched 2.6.20.1 with your patch, rebooted, got a soft lockup. Went back to stock 2.6.20.1 and did not.

Quoted 6 lines

I don't see how your patch (C&P below for reference) could make any difference...Especially because no hugepages were in use at the time. On patched 2.6.20.1, I was just trying to check if my source tree had your patch applied (by patch -p1 < davem.patch) and got the soft-lockup I saw in 2.6.20.3 with the patch applied. I am going to try a clean 2.6.20.3 as well, now.

We've seen cases in the past where something benign like this triggers a bug because it moves the data/bss/etc. sections around.

For example, if the used parts of the kernel image end up extending into another page, this can influence the bootup memory detection logic.

The softlockup in your first trace shows it spinning in the journaling code. Perhaps what is happening is that it is looping endlessly over some data structure which is in a corrupted state. This could happen if the bootup code erroneously frees up pages it should not have. I would recommend figuring out exactly what the journaling code is stuck on, then try to trace the life of that page of memory from early bootup until it is allocated.

I hope this can help you figure out this bug as I can't reproduce it here at all, and I did merge the hugetlb fix into Linus's tree already (and that is the right thing to do as we certainly have some unrelated bug here).

On the flip side, I bet removing some kernel config option might make the heisenbug go away if you're just eager to test the hugetlb patch :-)

maintainer
#8 lore raw
In reply to Bill Irwin

From: Bill Irwin <[email protected]>
Date: Tue, 13 Mar 2007 22:40:18 -0700

Quoted 1 line

I'm still trying to get on this.

See a response I just gave in this thread, I gave some tips that might help track down what's going wrong here.