mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-05 19:31:57 -04:00
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: 7b4884ca88 ("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>
This commit is contained in:
parent
2baa6c017f
commit
5b60ed401b
1 changed files with 3 additions and 1 deletions
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue