]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tpm: return -ENODEV if np is not set
authorColin Ian King <colin.king@canonical.com>
Tue, 15 Nov 2016 13:27:22 +0000 (13:27 +0000)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Sun, 27 Nov 2016 23:31:32 +0000 (01:31 +0200)
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>
drivers/char/tpm/tpm_of.c

index 643cc8ccb35bd945948709e82f377fab8240b61d..36df9df4c472b9738b1d2e375b204677097e61bf 100644 (file)
@@ -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);