Re: [patch 00/61] ANNOUNCE: lock validator -V1

[Arjan van de Ven]

On Tue, 2006-05-30 at 06:52 +0200, Mike Galbraith wrote:
> On Mon, 2006-05-29 at 23:21 +0200, Ingo Molnar wrote:
> > The easiest way to try lockdep on a testbox is to apply the combo patch 
> > to 2.6.17-rc4-mm3. The patch order is:
> > 
> >   http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc4.tar.bz2
> >   http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17-rc4/2.6.17-rc4-mm3/2.6.17-rc4-mm3.bz2
> >   http://redhat.com/~mingo/lockdep-patches/lockdep-combo.patch
> > 
> > do 'make oldconfig' and accept all the defaults for new config options - 
> > reboot into the kernel and if everything goes well it should boot up 
> > fine and you should have /proc/lockdep and /proc/lockdep_stats files.
> 
> Darn.  It said all tests passed, then oopsed.


does this fix it?


type->name can be NULL legitimately; all places but one check for this
already. Fix this off-by-one.

Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>

--- linux-2.6.17-rc4-mm3-lockdep/kernel/lockdep.c.org	2006-05-30 08:32:52.000000000 +0200
+++ linux-2.6.17-rc4-mm3-lockdep/kernel/lockdep.c	2006-05-30 08:33:09.000000000 +0200
@@ -1151,7 +1151,7 @@ int count_matching_names(struct lock_typ
 	list_for_each_entry(type, &all_lock_types, lock_entry) {
 		if (new_type->key - new_type->subtype == type->key)
 			return type->name_version;
-		if (!strcmp(type->name, new_type->name))
+		if (type->name && !strcmp(type->name, new_type->name))
 			count = max(count, type->name_version);
 	}
 


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/