From nobody Tue Apr 8 13:54:11 2025 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F121D4C74; Sat, 5 Apr 2025 13:53:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743861239; cv=none; b=LVTg2PLBUwiCjiwap/jXf+uIZfggojifp2SSpvyiTmUD0wvNddwfq8TlsN3BVsiGNSiz2KMlI7jHLYtevb+OI+TUNkPvSy0FCwDPl89qqXTdwlvZP5/Z7K+HwTboDJVv97JAwf+/KmWLGliqGQDzXzyYoA/fkrOLIOrmiZMEAzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743861239; c=relaxed/simple; bh=T1RSvScvxcv7Zj/q/d+mJYeaaKbUugb3H5HHiUp7Vu4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BKfCt1ju1Hj0hBrFYP8GARE2cQtSMaBsmGRCCqzkNW2IDys/bLX+1QSKnLe0ZiPnngQ2ZM0z5B2pr+gGhQaTnoy2Yrp1jcNDBuBhHmLhtnk6+UVuJUOUz41GyTTgxnrYTv1ZlAw4t8e8n8ysHEIVfbbNqxyHv2XXHAzqYHfY2tg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [221.222.48.127]) by APP-05 (Coremail) with SMTP id zQCowABHdv7uNfFnjG5FBg--.45561S2; Sat, 05 Apr 2025 21:53:51 +0800 (CST) From: Wentao Liang To: dlemoal@kernel.org, cassel@kernel.org Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Wentao Liang Subject: [PATCH v2] libata: Add error handling for pdc20621_i2c_read() Date: Sat, 5 Apr 2025 21:53:33 +0800 Message-ID: <20250405135333.2348-1-vulab@iscas.ac.cn> X-Mailer: git-send-email 2.42.0.windows.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowABHdv7uNfFnjG5FBg--.45561S2 X-Coremail-Antispam: 1UD129KBjvJXoW7KFWkWFW7Wr4xWw4xtF1xGrg_yoW8tFy5pr 4xKas8KryUWa12vF9xJrZxXFyfWr4kGa47KFWkC34fZw1Sqws7ZFySgay5tw1jkF17J3Wx X3W8tFWDCrWUXFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkK14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j 6r4UM28EF7xvwVC2z280aVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr 0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v2 6r126r1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrV AFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCI c40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267 AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_ Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjuHq7 UUUUU== X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiDAcDA2fwnxr5MQAAsR Content-Type: text/plain; charset="utf-8" The function pdc20621_prog_dimm0() calls the function pdc20621_i2c_read() but does not handle the error if the read fails. This could lead to process with invalid data. A proper inplementation can be found in /source/drivers/ata/sata_sx4.c, pdc20621_prog_dimm_global(). As mentioned in its commit: bb44e154e25125bef31fa956785e90fccd24610b, the variable spd0 might be used uninitialized when pdc20621_i2c_read() fails. Add error handling to the pdc20621_i2c_read(). If a read operation fails, an error message is logged via dev_err(), and return a negative error code. Add error handling to pdc20621_prog_dimm0() in pdc20621_dimm_init(), and return a negative error code if pdc20621_prog_dimm0() fails. Fixes: 4447d3515616 ("libata: convert the remaining SATA drivers to new ini= t model") Signed-off-by: Wentao Liang --- drivers/ata/sata_sx4.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index a482741eb181..c3042eca6332 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c @@ -1117,9 +1117,14 @@ static int pdc20621_prog_dimm0(struct ata_host *host) mmio +=3D PDC_CHIP0_OFS; =20 for (i =3D 0; i < ARRAY_SIZE(pdc_i2c_read_data); i++) - pdc20621_i2c_read(host, PDC_DIMM0_SPD_DEV_ADDRESS, - pdc_i2c_read_data[i].reg, - &spd0[pdc_i2c_read_data[i].ofs]); + if (!pdc20621_i2c_read(host, PDC_DIMM0_SPD_DEV_ADDRESS, + pdc_i2c_read_data[i].reg, + &spd0[pdc_i2c_read_data[i].ofs])) { + dev_err(host->dev, + "Failed in i2c read at index %d: device=3D%#x, reg=3D%#x\n", + i, PDC_DIMM0_SPD_DEV_ADDRESS, pdc_i2c_read_data[i].reg); + return -EIO; + } =20 data |=3D (spd0[4] - 8) | ((spd0[21] !=3D 0) << 3) | ((spd0[3]-11) << 4); data |=3D ((spd0[17] / 4) << 6) | ((spd0[5] / 2) << 7) | @@ -1284,6 +1289,8 @@ static unsigned int pdc20621_dimm_init(struct ata_hos= t *host) =20 /* Programming DIMM0 Module Control Register (index_CID0:80h) */ size =3D pdc20621_prog_dimm0(host); + if (size < 0) + return size; dev_dbg(host->dev, "Local DIMM Size =3D %dMB\n", size); =20 /* Programming DIMM Module Global Control Register (index_CID0:88h) */ --=20 2.42.0.windows.2