crypto: atmel-sha204a - Fix error codes in OTP reads

Return -EINVAL from atmel_i2c_init_read_otp_cmd() on invalid addresses
instead of -1. Since the OTP zone is accessed in 4-byte blocks, valid
addresses range from 0 to OTP_ZONE_SIZE / 4 - 1. Fix the bounds check
accordingly.

In atmel_sha204a_otp_read(), propagate the actual error code from
atmel_i2c_init_read_otp_cmd() instead of -1. Also, return -EIO instead
of -EINVAL when the device is not ready.

Cc: stable@vger.kernel.org
Fixes: e05ce444e9e5 ("crypto: atmel-sha204a - add reading from otp zone")
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Lothar Rubusch <l.rubusch@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/atmel-i2c.c b/drivers/crypto/atmel-i2c.c
index da3cd986b1eb7c78ed7317e488997af743f5c158..59d11fa5caebc8f95f707215e9620877e4e443e7 100644 (file)
--- a/drivers/crypto/atmel-i2c.c
+++ b/drivers/crypto/atmel-i2c.c
@@ -72,8 +72,8 @@ EXPORT_SYMBOL(atmel_i2c_init_read_config_cmd);
 
 int atmel_i2c_init_read_otp_cmd(struct atmel_i2c_cmd *cmd, u16 addr)
 {
-       if (addr < 0 || addr > OTP_ZONE_SIZE)
-               return -1;
+       if (addr >= OTP_ZONE_SIZE / 4)
+               return -EINVAL;
 
        cmd->word_addr = COMMAND;
        cmd->opcode = OPCODE_READ;

diff --git a/drivers/crypto/atmel-sha204a.c b/drivers/crypto/atmel-sha204a.c
index 98d1023007e31e8f301bae2c66eabb638f24ec2a..8f422ed223d32c31b4dda7c234d213e51494d7b6 100644 (file)
--- a/drivers/crypto/atmel-sha204a.c
+++ b/drivers/crypto/atmel-sha204a.c
@@ -95,9 +95,10 @@ static int atmel_sha204a_rng_read(struct hwrng *rng, void *data, size_t max,
 static int atmel_sha204a_otp_read(struct i2c_client *client, u16 addr, u8 *otp)
 {
        struct atmel_i2c_cmd cmd;
-       int ret = -1;
+       int ret;
 
-       if (atmel_i2c_init_read_otp_cmd(&cmd, addr) < 0) {
+       ret = atmel_i2c_init_read_otp_cmd(&cmd, addr);
+       if (ret < 0) {
                dev_err(&client->dev, "failed, invalid otp address %04X\n",
                        addr);
                return ret;
@@ -107,7 +108,7 @@ static int atmel_sha204a_otp_read(struct i2c_client *client, u16 addr, u8 *otp)
 
        if (cmd.data[0] == 0xff) {
                dev_err(&client->dev, "failed, device not ready\n");
-               return -EINVAL;
+               return -EIO;
        }
 
        memcpy(otp, cmd.data+1, 4);