commit 65ddf45a3102916fb622c71f7af158b19d49dc7f
author Kent Overstreet <kmo@daterainc.com> Mon Feb 24 19:55:28 2014 -0800
committer Kent Overstreet <kmo@daterainc.com> Mon Mar 17 19:01:03 2014 -0700
tree 2750fb8191169f39c5942cfce8b86a45d7f92281
parent 4fa03402cda2fac1a54248c7578b939d95931dc0

bcache: Fix a null ptr deref in journal replay

Signed-off-by: Kent Overstreet <kmo@daterainc.com>

drivers/md/bcache/journal.c

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index e38c599..97e6a92 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -287,9 +287,13 @@
 		     k < bset_bkey_last(&i->j);
 		     k = bkey_next(k)) {
 			unsigned j;
+			struct bucket *g;
 
 			for (j = 0; j < KEY_PTRS(k); j++) {
-				struct bucket *g = PTR_BUCKET(c, k, j);
+				if (!ptr_available(c, k, j))
+					continue;
+
+				g = PTR_BUCKET(c, k, j);
 				atomic_inc(&g->pin);
 
 				if (g->prio == BTREE_PRIO &&