From nobody Sat Feb 7 04:19:02 2026 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 489D11E1A08 for ; Mon, 20 Jan 2025 13:10:34 +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=1737378639; cv=none; b=hVpgENT4Edjm5PW8vd6xBahjcPbo8z2l6xmxCOPbA9qgOvF4lcyvZcK4A702NJaj7/DNZqK1GGVEBaWexJEoeKE7Z0aWk6LROOhlpme06Gb5NLt9lb/bE3MwkXju+7PSnpURfmAMffWHeGRdrmH645fcoqrqD82DDexBtsaKERo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737378639; c=relaxed/simple; bh=sx8CIPaZaF6AjPFzQ2DK65RPb7mbbsp91mnbzf530q0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NvddaJloJvC9Yr45iwy3LgkggkN8haPd4tsNIos9nqB8sMwBa6NiOKLR3xg2AHNyzIsKRxazblmL1qd0k+Fb+BikDPHtM8k2N2LDtAfhCvg3dEMMYqUGDztJEYtlrHbYX+VT1IzpbdQRHVmnTpvUOwpn+7Pgtha5nNViC7iZqh0= 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 [220.197.230.167]) by APP-03 (Coremail) with SMTP id rQCowAAH7jA_S45nm3NnCA--.24878S2; Mon, 20 Jan 2025 21:10:25 +0800 (CST) From: Wentao Liang To: linux@dominikbrodowski.net Cc: linux-kernel@vger.kernel.org, lee@kernel.org, Wentao Liang Subject: [PATCH] pcmcia: Add error handling for add_interval() in do_validate_mem() Date: Mon, 20 Jan 2025 21:10:06 +0800 Message-ID: <20250120131006.1332-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: rQCowAAH7jA_S45nm3NnCA--.24878S2 X-Coremail-Antispam: 1UD129KBjvJXoW7JFyfCrWDCF4xJFW5WF1rJFb_yoW8Jr1Upr WUGrWYyrWUAF4jyFW7AFyUWay3GayIg34UCr98K3y3ZF4Yka4av3ZxJa45JrWkCryrGr1U J3WDt398Za4UZ3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUym14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxG rwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4 vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IY x2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26c xKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAF wI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUywZ7UUUUU= X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiDAcIA2eOJZ5YKwAAsh Content-Type: text/plain; charset="utf-8" In the do_validate_mem(), the call to add_interval() does not handle errors. If kmalloc() fails in add_interval(), it could result in a null pointer being inserted into the linked list, leading to illegal memory access when sub_interval() is called next. This patch adds an error handling for the add_interval(). If add_interval() returns an error, the function will return early with the error code. Fixes: 7b4884ca8853 ("pcmcia: validate late-added resources") Signed-off-by: Wentao Liang --- drivers/pcmcia/rsrc_nonstatic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstati= c.c index bf9d070a4496..da494fe451ba 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -375,7 +375,9 @@ static int do_validate_mem(struct pcmcia_socket *s, =20 if (validate && !s->fake_cis) { /* move it to the validated data set */ - add_interval(&s_data->mem_db_valid, base, size); + ret =3D add_interval(&s_data->mem_db_valid, base, size); + if (ret) + return ret; sub_interval(&s_data->mem_db, base, size); } =20 --=20 2.42.0.windows.2