[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140924162233.GB8898@obsidianresearch.com>
Date: Wed, 24 Sep 2014 10:22:33 -0600
From: Jason Gunthorpe <jgunthorpe@...idianresearch.com>
To: Kiran Padwal <kiran.padwal@...rtplayin.com>
Cc: peterhuewe@....de, ashley@...leylai.com, tpmdd@...horst.net,
kiran.padwal21@...il.com, tpmdd-devel@...ts.sourceforge.net,
linux-kernel@...r.kernel.org
Subject: Re: [tpmdd-devel] [PATCH] char: tpm: Add missing error check for
devm_kzalloc
On Fri, Sep 19, 2014 at 12:44:39PM +0530, Kiran Padwal wrote:
> Currently these driver are missing a check on the return value of devm_kzalloc,
> which would cause a NULL pointer dereference in a OOM situation.
>
> This patch adds a missing check for tpm_i2c_atmel.c and tpm_i2c_nuvoton.c
Yes, my bad, thank you:
Reviewed-By: Jason Gunthorpe <jgunthorpe@...idianresearch.com>
> Signed-off-by: Kiran Padwal <kiran.padwal@...rtplayin.com>
> drivers/char/tpm/tpm_i2c_atmel.c | 4 ++++
> drivers/char/tpm/tpm_i2c_nuvoton.c | 5 +++++
> 2 files changed, 9 insertions(+)
>
> diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
> index 7727292..503a85a 100644
> +++ b/drivers/char/tpm/tpm_i2c_atmel.c
> @@ -168,6 +168,10 @@ static int i2c_atmel_probe(struct i2c_client *client,
>
> chip->vendor.priv = devm_kzalloc(dev, sizeof(struct priv_data),
> GFP_KERNEL);
> + if (!chip->vendor.priv) {
> + rc = -ENOMEM;
> + goto out_err;
> + }
>
> /* Default timeouts */
> chip->vendor.timeout_a = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index 7b158ef..23c7b13 100644
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -538,6 +538,11 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
>
> chip->vendor.priv = devm_kzalloc(dev, sizeof(struct priv_data),
> GFP_KERNEL);
> + if (!chip->vendor.priv) {
> + rc = -ENOMEM;
> + goto out_err;
> + }
> +
> init_waitqueue_head(&chip->vendor.read_queue);
> init_waitqueue_head(&chip->vendor.int_queue);
>
--
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/
Powered by blists - more mailing lists