diff options
| author | Wentao Liang <vulab@iscas.ac.cn> | 2025-01-20 21:10:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-09 18:56:32 +0200 |
| commit | 8699358b6ac99b8ccc97ed9e6e3669ef8958ef7b (patch) | |
| tree | dcacd1be5eb181ae8495c6142faae9b43e741411 | |
| parent | 3ee8f5c8938f5b1e1caa3c94ea624d4a215991c0 (diff) | |
| download | linux-8699358b6ac99b8ccc97ed9e6e3669ef8958ef7b.tar.gz linux-8699358b6ac99b8ccc97ed9e6e3669ef8958ef7b.tar.bz2 linux-8699358b6ac99b8ccc97ed9e6e3669ef8958ef7b.zip | |
pcmcia: Add error handling for add_interval() in do_validate_mem()
[ Upstream commit 4a81f78caa53e0633cf311ca1526377d9bff7479 ]
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 <vulab@iscas.ac.cn>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.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, if (validate && !s->fake_cis) { /* move it to the validated data set */ - add_interval(&s_data->mem_db_valid, base, size); + ret = add_interval(&s_data->mem_db_valid, base, size); + if (ret) + return ret; sub_interval(&s_data->mem_db, base, size); } |