From nobody Thu Apr 10 19:05:09 2025 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (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 2E7C12E3385; Thu, 3 Apr 2025 10:40:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743676830; cv=none; b=Jomf42lnXVUPv5HvEGKxt9fAAHoypWQ80bSlXTX/MBHIXSBts3JrL1xwSopzodRyFKomGFO6FmutpoLq1a+ub2scbF1SA/d5NCLIhPFJ2UZyy78dC36o/V+D1KnmtBJNRHa6qe0i1I9POg2U7qLu/wN1oPnMThOoShq7yVhNOgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743676830; c=relaxed/simple; bh=hoYH4U5j+7N4XYJinzRVDfRiiFxe9jZtYpOZfODRWvs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YZfuFSgOwNIjJL0e6Zfv4YmXBrPG70F6WhtcG6FVPYE5B66VNA1WWr5d4JwkdkGnCVJYURM3f2vxA87MNNxpIW+Uqtp0mA8nft4a2juuLQs55AfKgh7bTuFjgJNpRFuen2kwp/zlnT28CJ6ACyOuW8QmNH469Yw8H7Ch2HLM4n8= 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.81 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 [124.16.141.245]) by APP-03 (Coremail) with SMTP id rQCowABXA0CPZe5nlBB5BQ--.32803S2; Thu, 03 Apr 2025 18:40:17 +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] libata: Add error handling for pdc20621_i2c_read(). Date: Thu, 3 Apr 2025 18:39:57 +0800 Message-ID: <20250403103957.2550-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: rQCowABXA0CPZe5nlBB5BQ--.32803S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WFykuFW7Zr1UCFW8Xw17Awb_yoW8trWxpr 4xKas8KryUW3W2vFy3JrsxXFyrWw4kGa42kFWkC34fZw1Sqws7ZFyIgayrt3WjkF17W3Wx Z3W8tFWkCrWUXrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvv14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWU AVWUtwCY02Avz4vE14v_Gw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr 1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE 14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7 IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E 87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73Uj IFyTuYvjfUejgxUUUUU X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiBwoBA2fuKuvzSwAAs- Content-Type: text/plain; charset="utf-8" The pdc20621_prog_dimm0() calls the 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 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 an under-zero value to represent error situlation. Add error handling to pdc20621_prog_dimm0() in pdc20621_dimm_init(), and return a none-zero value when 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..a4027eb2fb66 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 -1; + } =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 1; 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