From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Thu, 29 Jun 2006 09:24:32 +0000 (-0700)
Subject: [PATCH] Deref in drivers/block/paride/pf.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e53cfc8f20345713fab7e290e19514a8032bb06;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[PATCH] Deref in drivers/block/paride/pf.c

Another possible dereference detected by coverity (id #759).  pf_probe()
might call pf_identify() which might call get_capacity() which dereferences
pf->disk

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 852b564e903a..1a9dee19efcf 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -707,7 +707,7 @@ static int pf_detect(void)
 			if (pi_init(pf->pi, 0, conf[D_PRT], conf[D_MOD],
 				    conf[D_UNI], conf[D_PRO], conf[D_DLY],
 				    pf_scratch, PI_PF, verbose, pf->name)) {
-				if (!pf_probe(pf) && pf->disk) {
+				if (pf->disk && !pf_probe(pf)) {
 					pf->present = 1;
 					k++;
 				} else