Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "mmc: mmc_test: Fix NULL dereference on allocation failure"

Browse source 
This reverts commit b70b468ec3.
This commit is contained in:
Ksawlii 2024-11-24 00:23:50 +01:00
parent 859e137741
commit 4791d94bc3
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/mmc/core/mmc_test.c
View file

@ -3125,13 +3125,13 @@ static ssize_t mtf_test_write(struct file *file, const char __user *buf,
test->buffer = kzalloc(BUFFER_SIZE, GFP_KERNEL); test->buffer = kzalloc(BUFFER_SIZE, GFP_KERNEL);
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
test->highmem = alloc_pages(GFP_KERNEL | __GFP_HIGHMEM, BUFFER_ORDER); test->highmem = alloc_pages(GFP_KERNEL | __GFP_HIGHMEM, BUFFER_ORDER);
if (!test->highmem) {
count = -ENOMEM;
goto free_test_buffer;
}
#endif #endif
#ifdef CONFIG_HIGHMEM
if (test->buffer && test->highmem) {
#else
if (test->buffer) { if (test->buffer) {
#endif
mutex_lock(&mmc_test_lock); mutex_lock(&mmc_test_lock);
mmc_test_run(test, testcase); mmc_test_run(test, testcase);
mutex_unlock(&mmc_test_lock); mutex_unlock(&mmc_test_lock);
@ -3139,7 +3139,6 @@ static ssize_t mtf_test_write(struct file *file, const char __user *buf,
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
__free_pages(test->highmem, BUFFER_ORDER); __free_pages(test->highmem, BUFFER_ORDER);
free_test_buffer:
#endif #endif
kfree(test->buffer); kfree(test->buffer);
kfree(test); kfree(test);