diff options
author | Colin Ian King <colin.king@canonical.com> | 2016-11-15 13:27:22 +0000 |
---|---|---|
committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-11-28 01:31:32 +0200 |
commit | 79eec5b940cffff14c7bd1b9eb856ccb36274cc2 (patch) | |
tree | f8985c0022ce634eed180a5968a35f690ee7ba73 /drivers/char/tpm/tpm_of.c | |
parent | 5efae7d6b07f37939f8f99d0983d5346f0c3e4e6 (diff) | |
download | op-kernel-dev-79eec5b940cffff14c7bd1b9eb856ccb36274cc2.zip op-kernel-dev-79eec5b940cffff14c7bd1b9eb856ccb36274cc2.tar.gz |
tpm: return -ENODEV if np is not set
device_node np contains a garbage value from the stack and it
is only set if chip->dev.parent->of_node is not null. Thus the
check for a null np won't spot a garbage value of np from the
stack if chip->dev.parent->of_node is null and if np contains
an garbage non-null value.
I believe the correct fix is to return -ENODEV if and only if
chip->dev.parent->of_node is null.
Found with static analysis by CoverityScan, CID 1377755
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char/tpm/tpm_of.c')
-rw-r--r-- | drivers/char/tpm/tpm_of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c index 643cc8c..36df9df 100644 --- a/drivers/char/tpm/tpm_of.c +++ b/drivers/char/tpm/tpm_of.c @@ -31,7 +31,7 @@ int tpm_read_log_of(struct tpm_chip *chip) log = &chip->log; if (chip->dev.parent->of_node) np = chip->dev.parent->of_node; - if (!np) + else return -ENODEV; sizep = of_get_property(np, "linux,sml-size", NULL); |