linux-kernel - [patch] TPM: handle errors from probe

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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120103131748.GA11575@elgon.mountain>
Date:	Tue, 3 Jan 2012 16:17:48 +0300
From:	Dan Carpenter <dan.carpenter@...cle.com>
To:	Debora Velarde <debora@...ux.vnet.ibm.com>
Cc:	Rajiv Andrade <srajiv@...ux.vnet.ibm.com>,
	Marcel Selhorst <m.selhorst@...rix.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	tpmdd-devel@...ts.sourceforge.net, linux-kernel@...r.kernel.org,
	kernel-janitors@...r.kernel.org
Subject: [patch] TPM: handle errors from probe_itpm()

We recently made itpm a bool in linux-next and it broke the error
handling here.  This patch also preserves the return codes from
probe_itpm() instead of always returning -ENODEV.

Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index a174862..08c6a07 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -538,11 +538,11 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
 		 vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
 
 	if (!itpm) {
-		itpm = probe_itpm(chip);
-		if (itpm < 0) {
-			rc = -ENODEV;
+		rc = probe_itpm(chip);
+		if (rc < 0)
 			goto out_err;
-		}
+		itpm = rc;
+		rc = 0;
 	}
 
 	if (itpm)
--
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/