From 0124fd76c8f70674faf4c549508a4fe77f2c5f03 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 13 Mar 2023 12:25:47 +0100 Subject: [PATCH] 5.4-stable patches added patches: nfc-change-order-inside-nfc_se_io-error-path.patch --- ...ge-order-inside-nfc_se_io-error-path.patch | 38 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 queue-5.4/nfc-change-order-inside-nfc_se_io-error-path.patch diff --git a/queue-5.4/nfc-change-order-inside-nfc_se_io-error-path.patch b/queue-5.4/nfc-change-order-inside-nfc_se_io-error-path.patch new file mode 100644 index 00000000000..68e07777641 --- /dev/null +++ b/queue-5.4/nfc-change-order-inside-nfc_se_io-error-path.patch @@ -0,0 +1,38 @@ +From 7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81 Mon Sep 17 00:00:00 2001 +From: Fedor Pchelkin +Date: Tue, 7 Mar 2023 00:26:50 +0300 +Subject: nfc: change order inside nfc_se_io error path + +From: Fedor Pchelkin + +commit 7d834b4d1ab66c48e8c0810fdeadaabb80fa2c81 upstream. + +cb_context should be freed on the error path in nfc_se_io as stated by +commit 25ff6f8a5a3b ("nfc: fix memory leak of se_io context in +nfc_genl_se_io"). + +Make the error path in nfc_se_io unwind everything in reverse order, i.e. +free the cb_context after unlocking the device. + +Suggested-by: Krzysztof Kozlowski +Signed-off-by: Fedor Pchelkin +Reviewed-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20230306212650.230322-1-pchelkin@ispras.ru +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/nfc/netlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/nfc/netlink.c ++++ b/net/nfc/netlink.c +@@ -1454,8 +1454,8 @@ static int nfc_se_io(struct nfc_dev *dev + return rc; + + error: +- kfree(cb_context); + device_unlock(&dev->dev); ++ kfree(cb_context); + return rc; + } + diff --git a/queue-5.4/series b/queue-5.4/series index 21b7bb2826f..8e1a541f9fe 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -6,3 +6,4 @@ ext4-fix-another-off-by-one-fsmap-error-on-1k-block-filesystems.patch ext4-move-where-set-the-may_inline_data-flag-is-set.patch ext4-fix-warning-in-ext4_update_inline_data.patch ext4-zero-i_disksize-when-initializing-the-bootloader-inode.patch +nfc-change-order-inside-nfc_se_io-error-path.patch -- 2.47.3