From 33a07f5c5d3861ffc05d28eea8ef87fa3ae75b4f Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 24 Jan 2024 18:54:26 -0500 Subject: [PATCH] Drop keys-encrypted-add-check-for-strsep.patch Signed-off-by: Sasha Levin --- .../keys-encrypted-add-check-for-strsep.patch | 37 ------------------- queue-6.1/series | 1 - .../keys-encrypted-add-check-for-strsep.patch | 37 ------------------- queue-6.6/series | 1 - .../keys-encrypted-add-check-for-strsep.patch | 37 ------------------- queue-6.7/series | 1 - 6 files changed, 114 deletions(-) delete mode 100644 queue-6.1/keys-encrypted-add-check-for-strsep.patch delete mode 100644 queue-6.6/keys-encrypted-add-check-for-strsep.patch delete mode 100644 queue-6.7/keys-encrypted-add-check-for-strsep.patch diff --git a/queue-6.1/keys-encrypted-add-check-for-strsep.patch b/queue-6.1/keys-encrypted-add-check-for-strsep.patch deleted file mode 100644 index 15742772601..00000000000 --- a/queue-6.1/keys-encrypted-add-check-for-strsep.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1cf7474886454ac2cc88f561bce4e95c7da2a272 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 8 Nov 2023 07:36:27 +0000 -Subject: KEYS: encrypted: Add check for strsep - -From: Chen Ni - -[ Upstream commit b4af096b5df5dd131ab796c79cedc7069d8f4882 ] - -Add check for strsep() in order to transfer the error. - -Fixes: cd3bc044af48 ("KEYS: encrypted: Instantiate key with user-provided decrypted data") -Signed-off-by: Chen Ni -Signed-off-by: Mimi Zohar -Signed-off-by: Sasha Levin ---- - security/keys/encrypted-keys/encrypted.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c -index 1e313982af02..fea7e0937150 100644 ---- a/security/keys/encrypted-keys/encrypted.c -+++ b/security/keys/encrypted-keys/encrypted.c -@@ -237,6 +237,10 @@ static int datablob_parse(char *datablob, const char **format, - break; - } - *decrypted_data = strsep(&datablob, " \t"); -+ if (!*decrypted_data) { -+ pr_info("encrypted_key: decrypted_data is missing\n"); -+ break; -+ } - ret = 0; - break; - case Opt_load: --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index b040127ac8d..60be5fca54d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -14,7 +14,6 @@ spi-spi-zynqmp-gqspi-fix-driver-kconfig-dependencies.patch mtd-rawnand-increment-ifc_timeout_msecs-for-nand-con.patch acpi-video-check-for-error-while-searching-for-backl.patch acpi-lpit-avoid-u32-multiplication-overflow.patch -keys-encrypted-add-check-for-strsep.patch platform-x86-intel-vsec-enhance-and-export-intel_vse.patch platform-x86-intel-vsec-support-private-data.patch platform-x86-intel-vsec-use-mutex-for-ida_alloc-and-.patch diff --git a/queue-6.6/keys-encrypted-add-check-for-strsep.patch b/queue-6.6/keys-encrypted-add-check-for-strsep.patch deleted file mode 100644 index c3c1743dfca..00000000000 --- a/queue-6.6/keys-encrypted-add-check-for-strsep.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 95de49cf9fcb150ac38e374d317df70e4dc5fe0f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 8 Nov 2023 07:36:27 +0000 -Subject: KEYS: encrypted: Add check for strsep - -From: Chen Ni - -[ Upstream commit b4af096b5df5dd131ab796c79cedc7069d8f4882 ] - -Add check for strsep() in order to transfer the error. - -Fixes: cd3bc044af48 ("KEYS: encrypted: Instantiate key with user-provided decrypted data") -Signed-off-by: Chen Ni -Signed-off-by: Mimi Zohar -Signed-off-by: Sasha Levin ---- - security/keys/encrypted-keys/encrypted.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c -index 1e313982af02..fea7e0937150 100644 ---- a/security/keys/encrypted-keys/encrypted.c -+++ b/security/keys/encrypted-keys/encrypted.c -@@ -237,6 +237,10 @@ static int datablob_parse(char *datablob, const char **format, - break; - } - *decrypted_data = strsep(&datablob, " \t"); -+ if (!*decrypted_data) { -+ pr_info("encrypted_key: decrypted_data is missing\n"); -+ break; -+ } - ret = 0; - break; - case Opt_load: --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 5fdcb50f131..d8951bfac18 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -23,7 +23,6 @@ spi-spi-zynqmp-gqspi-fix-driver-kconfig-dependencies.patch mtd-rawnand-increment-ifc_timeout_msecs-for-nand-con.patch acpi-video-check-for-error-while-searching-for-backl.patch acpi-lpit-avoid-u32-multiplication-overflow.patch -keys-encrypted-add-check-for-strsep.patch spi-cadence-quadspi-add-missing-clk_disable_unprepar.patch platform-x86-intel-vsec-fix-xa_alloc-memory-leak.patch cpufreq-scmi-process-the-result-of-devm_of_clk_add_h.patch diff --git a/queue-6.7/keys-encrypted-add-check-for-strsep.patch b/queue-6.7/keys-encrypted-add-check-for-strsep.patch deleted file mode 100644 index bd146421e59..00000000000 --- a/queue-6.7/keys-encrypted-add-check-for-strsep.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f847e1f37f817057e8f333ebf66f37c6e682902 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 8 Nov 2023 07:36:27 +0000 -Subject: KEYS: encrypted: Add check for strsep - -From: Chen Ni - -[ Upstream commit b4af096b5df5dd131ab796c79cedc7069d8f4882 ] - -Add check for strsep() in order to transfer the error. - -Fixes: cd3bc044af48 ("KEYS: encrypted: Instantiate key with user-provided decrypted data") -Signed-off-by: Chen Ni -Signed-off-by: Mimi Zohar -Signed-off-by: Sasha Levin ---- - security/keys/encrypted-keys/encrypted.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c -index 8af2136069d2..76f55dd13cb8 100644 ---- a/security/keys/encrypted-keys/encrypted.c -+++ b/security/keys/encrypted-keys/encrypted.c -@@ -237,6 +237,10 @@ static int datablob_parse(char *datablob, const char **format, - break; - } - *decrypted_data = strsep(&datablob, " \t"); -+ if (!*decrypted_data) { -+ pr_info("encrypted_key: decrypted_data is missing\n"); -+ break; -+ } - ret = 0; - break; - case Opt_load: --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 0c1b89901fb..ba60b569eeb 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -23,7 +23,6 @@ spi-spi-zynqmp-gqspi-fix-driver-kconfig-dependencies.patch mtd-rawnand-increment-ifc_timeout_msecs-for-nand-con.patch acpi-video-check-for-error-while-searching-for-backl.patch acpi-lpit-avoid-u32-multiplication-overflow.patch -keys-encrypted-add-check-for-strsep.patch spi-cadence-quadspi-add-missing-clk_disable_unprepar.patch platform-x86-intel-vsec-fix-xa_alloc-memory-leak.patch cpufreq-scmi-process-the-result-of-devm_of_clk_add_h.patch -- 2.47.3