Unverified Commit 6193ca62 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11627 [sync] PR-11615: mmc: mmc_test: Fix NULL dereference on allocation failure 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/11615 
 
PR sync from: Cai Xinchen <caixinchen1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/L4UO4MU7BDQC2BMEP33ACYC4JJ3ZMZPF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAQOJH 
 
Link:https://gitee.com/openeuler/kernel/pulls/11627

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 68bb3c40 3ac485a1

drivers/mmc/core/mmc_test.c

+5 −4
Original line number Diff line number Diff line
@@ -3125,13 +3125,13 @@ static ssize_t mtf_test_write(struct file *file, const char __user *buf, 
	test->buffer = kzalloc(BUFFER_SIZE, GFP_KERNEL);

#ifdef CONFIG_HIGHMEM

	test->highmem = alloc_pages(GFP_KERNEL | __GFP_HIGHMEM, BUFFER_ORDER);

	if (!test->highmem) {

		count = -ENOMEM;

		goto free_test_buffer;

	}

#endif



#ifdef CONFIG_HIGHMEM

	if (test->buffer && test->highmem) {

#else

	if (test->buffer) {

#endif

		mutex_lock(&mmc_test_lock);

		mmc_test_run(test, testcase);

		mutex_unlock(&mmc_test_lock);
@@ -3139,6 +3139,7 @@ static ssize_t mtf_test_write(struct file *file, const char __user *buf, 


#ifdef CONFIG_HIGHMEM

	__free_pages(test->highmem, BUFFER_ORDER);

free_test_buffer:

#endif

	kfree(test->buffer);

	kfree(test);