From e09c96985634832a5b1daff5f33f867dae8a3d1b Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 17 Aug 2023 20:43:30 -0400 Subject: [PATCH] Drop apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch Signed-off-by: Sasha Levin --- ...-use-of-strcpy-in-policy_unpack_test.patch | 78 ------------------- queue-5.10/series | 1 - ...-use-of-strcpy-in-policy_unpack_test.patch | 78 ------------------- queue-5.15/series | 1 - ...-use-of-strcpy-in-policy_unpack_test.patch | 78 ------------------- queue-6.1/series | 1 - ...-use-of-strcpy-in-policy_unpack_test.patch | 78 ------------------- queue-6.4/series | 1 - 8 files changed, 316 deletions(-) delete mode 100644 queue-5.10/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch delete mode 100644 queue-5.15/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch delete mode 100644 queue-6.1/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch delete mode 100644 queue-6.4/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch diff --git a/queue-5.10/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch b/queue-5.10/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch deleted file mode 100644 index d80a31bf705..00000000000 --- a/queue-5.10/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 49ae1294b3a9f52f0dec083b0c0ad13b6e41388d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jan 2023 20:12:19 +0000 -Subject: apparmor: fix use of strcpy in policy_unpack_test - -From: Rae Moar - -[ Upstream commit b54aebd4411134b525a82d663a26b2f135ecb7e8 ] - -Replace the use of strcpy() in build_aa_ext_struct() in -policy_unpack_test.c with strscpy(). - -strscpy() is the safer method to use to ensure the buffer does not -overflow. This was found by kernel test robot: -https://lore.kernel.org/all/202301040348.NbfVsXO0-lkp@intel.com/. - -Reported-by: kernel test robot - -Signed-off-by: Rae Moar -Signed-off-by: John Johansen -Signed-off-by: Sasha Levin ---- - security/apparmor/policy_unpack_test.c | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c -index 533137f45361c..3c84981aa1f48 100644 ---- a/security/apparmor/policy_unpack_test.c -+++ b/security/apparmor/policy_unpack_test.c -@@ -66,31 +66,30 @@ struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_STRING_NAME) + 1; -- strcpy(buf + 3, TEST_STRING_NAME); -+ strscpy(buf + 3, TEST_STRING_NAME, e->end - (void *)(buf + 3)); - - buf = e->start + TEST_STRING_BUF_OFFSET; - *buf = AA_STRING; - *(buf + 1) = strlen(TEST_STRING_DATA) + 1; -- strcpy(buf + 3, TEST_STRING_DATA); -- -+ strscpy(buf + 3, TEST_STRING_DATA, e->end - (void *)(buf + 3)); - buf = e->start + TEST_NAMED_U32_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U32_NAME) + 1; -- strcpy(buf + 3, TEST_U32_NAME); -+ strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32; - *((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA; - - buf = e->start + TEST_NAMED_U64_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U64_NAME) + 1; -- strcpy(buf + 3, TEST_U64_NAME); -+ strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64; - *((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA; - - buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_BLOB_NAME) + 1; -- strcpy(buf + 3, TEST_BLOB_NAME); -+ strscpy(buf + 3, TEST_BLOB_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_BLOB_NAME) + 1) = AA_BLOB; - *(buf + 3 + strlen(TEST_BLOB_NAME) + 2) = TEST_BLOB_DATA_SIZE; - memcpy(buf + 3 + strlen(TEST_BLOB_NAME) + 6, -@@ -99,7 +98,7 @@ struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - buf = e->start + TEST_NAMED_ARRAY_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1; -- strcpy(buf + 3, TEST_ARRAY_NAME); -+ strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY; - *((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE; - --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index e82c0fdd99b..c688d7018b1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -36,7 +36,6 @@ bluetooth-btusb-add-mt7922-bluetooth-id-for-the-asus.patch drm-amdgpu-fix-potential-fence-use-after-free-v2.patch alsa-hda-realtek-add-quirks-for-unis-h3c-desktop-b76.patch alsa-hda-fix-a-possible-null-pointer-dereference-due.patch -apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch powerpc-kasan-disable-kcov-in-kasan-code.patch ring-buffer-do-not-swap-cpu_buffer-during-resize-pro.patch ima-allow-fix-uml-builds.patch diff --git a/queue-5.15/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch b/queue-5.15/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch deleted file mode 100644 index 6cc2f734aa8..00000000000 --- a/queue-5.15/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch +++ /dev/null @@ -1,78 +0,0 @@ -From cd977c31a043251b9fe334afe2a2ab102689f5a0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jan 2023 20:12:19 +0000 -Subject: apparmor: fix use of strcpy in policy_unpack_test - -From: Rae Moar - -[ Upstream commit b54aebd4411134b525a82d663a26b2f135ecb7e8 ] - -Replace the use of strcpy() in build_aa_ext_struct() in -policy_unpack_test.c with strscpy(). - -strscpy() is the safer method to use to ensure the buffer does not -overflow. This was found by kernel test robot: -https://lore.kernel.org/all/202301040348.NbfVsXO0-lkp@intel.com/. - -Reported-by: kernel test robot - -Signed-off-by: Rae Moar -Signed-off-by: John Johansen -Signed-off-by: Sasha Levin ---- - security/apparmor/policy_unpack_test.c | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c -index 533137f45361c..3c84981aa1f48 100644 ---- a/security/apparmor/policy_unpack_test.c -+++ b/security/apparmor/policy_unpack_test.c -@@ -66,31 +66,30 @@ struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_STRING_NAME) + 1; -- strcpy(buf + 3, TEST_STRING_NAME); -+ strscpy(buf + 3, TEST_STRING_NAME, e->end - (void *)(buf + 3)); - - buf = e->start + TEST_STRING_BUF_OFFSET; - *buf = AA_STRING; - *(buf + 1) = strlen(TEST_STRING_DATA) + 1; -- strcpy(buf + 3, TEST_STRING_DATA); -- -+ strscpy(buf + 3, TEST_STRING_DATA, e->end - (void *)(buf + 3)); - buf = e->start + TEST_NAMED_U32_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U32_NAME) + 1; -- strcpy(buf + 3, TEST_U32_NAME); -+ strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32; - *((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA; - - buf = e->start + TEST_NAMED_U64_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U64_NAME) + 1; -- strcpy(buf + 3, TEST_U64_NAME); -+ strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64; - *((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA; - - buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_BLOB_NAME) + 1; -- strcpy(buf + 3, TEST_BLOB_NAME); -+ strscpy(buf + 3, TEST_BLOB_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_BLOB_NAME) + 1) = AA_BLOB; - *(buf + 3 + strlen(TEST_BLOB_NAME) + 2) = TEST_BLOB_DATA_SIZE; - memcpy(buf + 3 + strlen(TEST_BLOB_NAME) + 6, -@@ -99,7 +98,7 @@ struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - buf = e->start + TEST_NAMED_ARRAY_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1; -- strcpy(buf + 3, TEST_ARRAY_NAME); -+ strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY; - *((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE; - --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 5ce4bd06726..9200719a267 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -35,7 +35,6 @@ fs-ntfs3-fix-possible-null-pointer-dereferences-in-m.patch fs-ntfs3-mark-ntfs-dirty-when-on-disk-struct-is-corr.patch alsa-hda-realtek-add-quirks-for-unis-h3c-desktop-b76.patch alsa-hda-fix-a-possible-null-pointer-dereference-due.patch -apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch powerpc-kasan-disable-kcov-in-kasan-code.patch ring-buffer-do-not-swap-cpu_buffer-during-resize-pro.patch iio-add-addac-subdirectory.patch diff --git a/queue-6.1/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch b/queue-6.1/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch deleted file mode 100644 index 3a778e3b981..00000000000 --- a/queue-6.1/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch +++ /dev/null @@ -1,78 +0,0 @@ -From db21c0732460f1bab090a6477a4bbb9b8114b55a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jan 2023 20:12:19 +0000 -Subject: apparmor: fix use of strcpy in policy_unpack_test - -From: Rae Moar - -[ Upstream commit b54aebd4411134b525a82d663a26b2f135ecb7e8 ] - -Replace the use of strcpy() in build_aa_ext_struct() in -policy_unpack_test.c with strscpy(). - -strscpy() is the safer method to use to ensure the buffer does not -overflow. This was found by kernel test robot: -https://lore.kernel.org/all/202301040348.NbfVsXO0-lkp@intel.com/. - -Reported-by: kernel test robot - -Signed-off-by: Rae Moar -Signed-off-by: John Johansen -Signed-off-by: Sasha Levin ---- - security/apparmor/policy_unpack_test.c | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c -index 0a969b2e03dba..64ddea559f9ac 100644 ---- a/security/apparmor/policy_unpack_test.c -+++ b/security/apparmor/policy_unpack_test.c -@@ -66,31 +66,30 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_STRING_NAME) + 1; -- strcpy(buf + 3, TEST_STRING_NAME); -+ strscpy(buf + 3, TEST_STRING_NAME, e->end - (void *)(buf + 3)); - - buf = e->start + TEST_STRING_BUF_OFFSET; - *buf = AA_STRING; - *(buf + 1) = strlen(TEST_STRING_DATA) + 1; -- strcpy(buf + 3, TEST_STRING_DATA); -- -+ strscpy(buf + 3, TEST_STRING_DATA, e->end - (void *)(buf + 3)); - buf = e->start + TEST_NAMED_U32_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U32_NAME) + 1; -- strcpy(buf + 3, TEST_U32_NAME); -+ strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32; - *((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA; - - buf = e->start + TEST_NAMED_U64_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U64_NAME) + 1; -- strcpy(buf + 3, TEST_U64_NAME); -+ strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64; - *((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA; - - buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_BLOB_NAME) + 1; -- strcpy(buf + 3, TEST_BLOB_NAME); -+ strscpy(buf + 3, TEST_BLOB_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_BLOB_NAME) + 1) = AA_BLOB; - *(buf + 3 + strlen(TEST_BLOB_NAME) + 2) = TEST_BLOB_DATA_SIZE; - memcpy(buf + 3 + strlen(TEST_BLOB_NAME) + 6, -@@ -99,7 +98,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - buf = e->start + TEST_NAMED_ARRAY_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1; -- strcpy(buf + 3, TEST_ARRAY_NAME); -+ strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY; - *((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE; - --- -2.40.1 - diff --git a/queue-6.1/series b/queue-6.1/series index 7afe2e45989..0cad1547402 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -66,7 +66,6 @@ alsa-hda-realtek-add-quirks-for-unis-h3c-desktop-b76.patch alsa-hda-fix-a-possible-null-pointer-dereference-due.patch alsa-hda-realtek-add-quirk-for-asus-rog-gx650p.patch alsa-hda-realtek-add-quirk-for-asus-rog-ga402x.patch -apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch alsa-hda-realtek-add-quirk-for-asus-rog-gz301v.patch powerpc-kasan-disable-kcov-in-kasan-code.patch bluetooth-mgmt-use-correct-address-for-memcpy.patch diff --git a/queue-6.4/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch b/queue-6.4/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch deleted file mode 100644 index d4d22c75396..00000000000 --- a/queue-6.4/apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 711dd4ba0e42156e1a9a2673ac6a40733d19e760 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jan 2023 20:12:19 +0000 -Subject: apparmor: fix use of strcpy in policy_unpack_test - -From: Rae Moar - -[ Upstream commit b54aebd4411134b525a82d663a26b2f135ecb7e8 ] - -Replace the use of strcpy() in build_aa_ext_struct() in -policy_unpack_test.c with strscpy(). - -strscpy() is the safer method to use to ensure the buffer does not -overflow. This was found by kernel test robot: -https://lore.kernel.org/all/202301040348.NbfVsXO0-lkp@intel.com/. - -Reported-by: kernel test robot - -Signed-off-by: Rae Moar -Signed-off-by: John Johansen -Signed-off-by: Sasha Levin ---- - security/apparmor/policy_unpack_test.c | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c -index e1bfdab524b79..5c9bde25e56df 100644 ---- a/security/apparmor/policy_unpack_test.c -+++ b/security/apparmor/policy_unpack_test.c -@@ -69,31 +69,30 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_STRING_NAME) + 1; -- strcpy(buf + 3, TEST_STRING_NAME); -+ strscpy(buf + 3, TEST_STRING_NAME, e->end - (void *)(buf + 3)); - - buf = e->start + TEST_STRING_BUF_OFFSET; - *buf = AA_STRING; - *(buf + 1) = strlen(TEST_STRING_DATA) + 1; -- strcpy(buf + 3, TEST_STRING_DATA); -- -+ strscpy(buf + 3, TEST_STRING_DATA, e->end - (void *)(buf + 3)); - buf = e->start + TEST_NAMED_U32_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U32_NAME) + 1; -- strcpy(buf + 3, TEST_U32_NAME); -+ strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32; - *((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA; - - buf = e->start + TEST_NAMED_U64_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_U64_NAME) + 1; -- strcpy(buf + 3, TEST_U64_NAME); -+ strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64; - *((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA; - - buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_BLOB_NAME) + 1; -- strcpy(buf + 3, TEST_BLOB_NAME); -+ strscpy(buf + 3, TEST_BLOB_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_BLOB_NAME) + 1) = AA_BLOB; - *(buf + 3 + strlen(TEST_BLOB_NAME) + 2) = TEST_BLOB_DATA_SIZE; - memcpy(buf + 3 + strlen(TEST_BLOB_NAME) + 6, -@@ -102,7 +101,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, - buf = e->start + TEST_NAMED_ARRAY_BUF_OFFSET; - *buf = AA_NAME; - *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1; -- strcpy(buf + 3, TEST_ARRAY_NAME); -+ strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3)); - *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY; - *((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE; - --- -2.40.1 - diff --git a/queue-6.4/series b/queue-6.4/series index a3d35ef0846..e66387711e0 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -81,7 +81,6 @@ alsa-hda-realtek-add-quirk-for-asus-rog-gx650p.patch alsa-hda-realtek-add-quirk-for-asus-rog-ga402x.patch alsa-hda-realtek-amend-g634-quirk-to-enable-rear-spe.patch alsa-hda-realtek-add-quirk-for-asus-rog-g614jx.patch -apparmor-fix-use-of-strcpy-in-policy_unpack_test.patch alsa-hda-realtek-add-quirk-for-asus-rog-gz301v.patch powerpc-kasan-disable-kcov-in-kasan-code.patch bluetooth-mgmt-use-correct-address-for-memcpy.patch -- 2.47.3