From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 024B32BDC13 for ; Tue, 24 Feb 2026 22:57:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771973876; cv=none; b=hKeqDq3/RnHM2vO0t0AKwT79miEjQZBk8TtPR0IzelOx1A5LJ0FnbSADy7Vz61oPpz3B2GITFJzpU604tDXcilFHdoNjyNOOhfzufe23QSxZNIfBY6KEiJ1zEG2MXqW0kC7gz7dn2JFH4vo6a/v4Iqz8tL645kOK7UtP4Ov9GkE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771973876; c=relaxed/simple; bh=3dLKrnQBENwZevGLnguA06EvPdRwmV8bjOJlsLNMa6c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RJH9NkoRG36XsTZGntb2MWlxvDA2xLJtn3xPZcOGuNusyCEq/k+hmFRGGCDT3huauuyP+BvNbVEPB0B1ZG2DIZNgJ5x1akF06ZgesPmWv1VZaa1RoGXELhPICpkGY0/2ADzwnwbgIR7eKubPyxRX0Xiq6MP+S/Wte6U5qOFldNc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=jcELf9x7; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="jcELf9x7" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1771973862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NGJ4m6uSFJeo4IGOp1CFoC2THWgwdRgpjYr/fElumKk=; b=jcELf9x7tzrjzQfZEk71ZhmHikjCeZn8fjx0cJxXz4IG1YiBtZeljCqJsWJlzSMxtCD+Ui KunCXjvojxynhaE5IelD3bzUBZuO7UrJIjM9y1eRh9ybDoXsX9vQdCZptQZWCaMH+5m7bw GfwdBiIXC3mbRoNKqGLMUPx1UiLgxKo= From: Thorsten Blum To: Herbert Xu , "David S. Miller" , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Lothar Rubusch Cc: Thorsten Blum , stable@vger.kernel.org, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: atmel-sha204a - Fix OTP address check and uninitialized data access Date: Tue, 24 Feb 2026 23:55:47 +0100 Message-ID: <20260224225547.683713-2-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 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, and return early if atmel_i2c_send_receive() fails to avoid checking potentially uninitialized data in 'cmd.data'. Also, return -EIO instead of -EINVAL when the device is not ready. Fixes: e05ce444e9e5 ("crypto: atmel-sha204a - add reading from otp zone") Cc: stable@vger.kernel.org Reviewed-by: Lothar Rubusch Signed-off-by: Thorsten Blum --- Compile-tested only. This patch combines [1] and [2], as suggested by Lothar in [2]. Lothar's Reviewed-by: for [1] has been preserved. In [2], Lothar questioned whether returning -EIO is appropriate; the exact error code can be adjusted if needed. The errno is currently not propagated to userspace, but [3] changes this. [1] https://lore.kernel.org/lkml/20260215205152.518472-3-thorsten.blum@linux.dev/ [2] https://lore.kernel.org/lkml/20260220133135.1122081-2-thorsten.blum@linux.dev/ [3] https://lore.kernel.org/lkml/20260216074552.656814-1-thorsten.blum@linux.dev/ --- drivers/crypto/atmel-i2c.c | 4 ++-- drivers/crypto/atmel-sha204a.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/atmel-i2c.c b/drivers/crypto/atmel-i2c.c index da3cd986b1eb..59d11fa5caeb 100644 --- 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 8adc7fe71c04..b0480d3bec70 100644 --- a/drivers/crypto/atmel-sha204a.c +++ b/drivers/crypto/atmel-sha204a.c @@ -94,19 +94,24 @@ 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; } ret = atmel_i2c_send_receive(client, &cmd); + if (ret < 0) { + dev_err(&client->dev, "failed to read otp at %04X\n", addr); + return ret; + } if (cmd.data[0] == 0xff) { dev_err(&client->dev, "failed, device not ready\n"); - return -EINVAL; + return -EIO; } memcpy(otp, cmd.data+1, 4); -- Thorsten Blum GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4