linux-kernel - [GIT PULL] SLAB updates for 2.6.33-rc2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.0912282103160.18425@melkki.cs.helsinki.fi>
Date:	Mon, 28 Dec 2009 21:05:32 +0200 (EET)
From:	Pekka J Enberg <penberg@...helsinki.fi>
To:	torvalds@...ux-foundation.org
cc:	linux-kernel@...r.kernel.org, akpm@...ux-foundation.org,
	cl@...ux-foundation.org
Subject: [GIT PULL] SLAB updates for 2.6.33-rc2

Hi Linus,

Here's a fix for SLAB lockdep annotation breakage that's causing false 
positives in 2.6.33-rc2.

 			Pekka

The following changes since commit 6b7b284958d47b77d06745b36bc7f36dab769d9b:
   Linus Torvalds (1):
         Linux 2.6.33-rc2

are available in the git repository at:

   ssh://master.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 slab/urgent

Pekka Enberg (1):
       SLAB: Fix lockdep annotation breakage

  mm/slab.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 7d41f15..7451bda 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -654,7 +654,7 @@ static void init_node_lock_keys(int q)

  		l3 = s->cs_cachep->nodelists[q];
  		if (!l3 || OFF_SLAB(s->cs_cachep))
-			return;
+			continue;
  		lockdep_set_class(&l3->list_lock, &on_slab_l3_key);
  		alc = l3->alien;
  		/*
@@ -665,7 +665,7 @@ static void init_node_lock_keys(int q)
  		 * for alloc_alien_cache,
  		 */
  		if (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC)
-			return;
+			continue;
  		for_each_node(r) {
  			if (alc[r])
  				lockdep_set_class(&alc[r]->lock,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/