diff options
author | Justin Forbes <jmforbes@xps.linuxtx.org> | 2019-12-30 10:46:19 -0600 |
---|---|---|
committer | Justin Forbes <jmforbes@xps.linuxtx.org> | 2019-12-30 10:46:19 -0600 |
commit | 007e505ae0ba5e967c5aebf29885a44263042654 (patch) | |
tree | 1baae27bfc3068ef5deef05855c6980538479b6b /0001-iwlwifi-dbg_ini-fix-memory-leak-in-alloc_sgtable.patch | |
parent | df5a06e2f275dc0e06fca38c398bc253f9f836a7 (diff) | |
download | kernel-007e505ae0ba5e967c5aebf29885a44263042654.tar.gz kernel-007e505ae0ba5e967c5aebf29885a44263042654.tar.xz kernel-007e505ae0ba5e967c5aebf29885a44263042654.zip |
Linux v5.4.6 rebase
Diffstat (limited to '0001-iwlwifi-dbg_ini-fix-memory-leak-in-alloc_sgtable.patch')
-rw-r--r-- | 0001-iwlwifi-dbg_ini-fix-memory-leak-in-alloc_sgtable.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/0001-iwlwifi-dbg_ini-fix-memory-leak-in-alloc_sgtable.patch b/0001-iwlwifi-dbg_ini-fix-memory-leak-in-alloc_sgtable.patch deleted file mode 100644 index d82c3f254..000000000 --- a/0001-iwlwifi-dbg_ini-fix-memory-leak-in-alloc_sgtable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b4b814fec1a5a849383f7b3886b654a13abbda7d Mon Sep 17 00:00:00 2001 -From: Navid Emamdoost <navid.emamdoost@gmail.com> -Date: Thu, 12 Sep 2019 23:23:27 -0500 -Subject: [PATCH] iwlwifi: dbg_ini: fix memory leak in alloc_sgtable - -In alloc_sgtable if alloc_page fails, the alocated table should be -released. - -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> ---- - drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c -index 5c8602de9168..87421807e040 100644 ---- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c -+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c -@@ -646,6 +646,7 @@ static struct scatterlist *alloc_sgtable(int size) - if (new_page) - __free_page(new_page); - } -+ kfree(table); - return NULL; - } - alloc_size = min_t(int, size, PAGE_SIZE); --- -2.23.0 - |