From: Greg Kroah-Hartman Date: Mon, 7 Nov 2022 15:34:44 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.9.333~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0572ec5e9b47203f797a75bc4f6adaf7255edbe;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: capabilities-fix-potential-memleak-on-error-path-from-vfs_getxattr_alloc.patch efi-random-reduce-seed-size-to-32-bytes.patch fuse-add-file_modified-to-fallocate.patch kprobe-reverse-kp-flags-when-arm_kprobe-failed.patch perf-x86-intel-add-cooper-lake-stepping-to-isolation_ucodes.patch perf-x86-intel-fix-pebs-event-constraints-for-icl.patch tools-nolibc-string-fix-memcmp-implementation.patch tracing-histogram-update-document-for-keys_max-size.patch --- diff --git a/queue-5.4/capabilities-fix-potential-memleak-on-error-path-from-vfs_getxattr_alloc.patch b/queue-5.4/capabilities-fix-potential-memleak-on-error-path-from-vfs_getxattr_alloc.patch new file mode 100644 index 00000000000..e09c71bd2ac --- /dev/null +++ b/queue-5.4/capabilities-fix-potential-memleak-on-error-path-from-vfs_getxattr_alloc.patch @@ -0,0 +1,51 @@ +From 8cf0a1bc12870d148ae830a4ba88cfdf0e879cee Mon Sep 17 00:00:00 2001 +From: Gaosheng Cui +Date: Tue, 25 Oct 2022 21:33:57 +0800 +Subject: capabilities: fix potential memleak on error path from vfs_getxattr_alloc() + +From: Gaosheng Cui + +commit 8cf0a1bc12870d148ae830a4ba88cfdf0e879cee upstream. + +In cap_inode_getsecurity(), we will use vfs_getxattr_alloc() to +complete the memory allocation of tmpbuf, if we have completed +the memory allocation of tmpbuf, but failed to call handler->get(...), +there will be a memleak in below logic: + + |-- ret = (int)vfs_getxattr_alloc(mnt_userns, ...) + | /* ^^^ alloc for tmpbuf */ + |-- value = krealloc(*xattr_value, error + 1, flags) + | /* ^^^ alloc memory */ + |-- error = handler->get(handler, ...) + | /* error! */ + |-- *xattr_value = value + | /* xattr_value is &tmpbuf (memory leak!) */ + +So we will try to free(tmpbuf) after vfs_getxattr_alloc() fails to fix it. + +Cc: stable@vger.kernel.org +Fixes: 8db6c34f1dbc ("Introduce v3 namespaced file capabilities") +Signed-off-by: Gaosheng Cui +Acked-by: Serge Hallyn +[PM: subject line and backtrace tweaks] +Signed-off-by: Paul Moore +Signed-off-by: Greg Kroah-Hartman +--- + security/commoncap.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -391,8 +391,10 @@ int cap_inode_getsecurity(struct inode * + &tmpbuf, size, GFP_NOFS); + dput(dentry); + +- if (ret < 0 || !tmpbuf) +- return ret; ++ if (ret < 0 || !tmpbuf) { ++ size = ret; ++ goto out_free; ++ } + + fs_ns = inode->i_sb->s_user_ns; + cap = (struct vfs_cap_data *) tmpbuf; diff --git a/queue-5.4/efi-random-reduce-seed-size-to-32-bytes.patch b/queue-5.4/efi-random-reduce-seed-size-to-32-bytes.patch new file mode 100644 index 00000000000..31998cd02fc --- /dev/null +++ b/queue-5.4/efi-random-reduce-seed-size-to-32-bytes.patch @@ -0,0 +1,50 @@ +From 161a438d730dade2ba2b1bf8785f0759aba4ca5f Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Thu, 20 Oct 2022 10:39:08 +0200 +Subject: efi: random: reduce seed size to 32 bytes + +From: Ard Biesheuvel + +commit 161a438d730dade2ba2b1bf8785f0759aba4ca5f upstream. + +We no longer need at least 64 bytes of random seed to permit the early +crng init to complete. The RNG is now based on Blake2s, so reduce the +EFI seed size to the Blake2s hash size, which is sufficient for our +purposes. + +While at it, drop the READ_ONCE(), which was supposed to prevent size +from being evaluated after seed was unmapped. However, this cannot +actually happen, so READ_ONCE() is unnecessary here. + +Cc: # v4.14+ +Signed-off-by: Ard Biesheuvel +Reviewed-by: Jason A. Donenfeld +Acked-by: Ilias Apalodimas +Signed-off-by: Greg Kroah-Hartman +--- + drivers/firmware/efi/efi.c | 2 +- + include/linux/efi.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/firmware/efi/efi.c ++++ b/drivers/firmware/efi/efi.c +@@ -546,7 +546,7 @@ int __init efi_config_parse_tables(void + + seed = early_memremap(efi.rng_seed, sizeof(*seed)); + if (seed != NULL) { +- size = READ_ONCE(seed->size); ++ size = min(seed->size, EFI_RANDOM_SEED_SIZE); + early_memunmap(seed, sizeof(*seed)); + } else { + pr_err("Could not map UEFI random seed!\n"); +--- a/include/linux/efi.h ++++ b/include/linux/efi.h +@@ -1715,7 +1715,7 @@ efi_status_t efi_exit_boot_services(efi_ + void *priv, + efi_exit_boot_map_processing priv_func); + +-#define EFI_RANDOM_SEED_SIZE 64U ++#define EFI_RANDOM_SEED_SIZE 32U // BLAKE2S_HASH_SIZE + + struct linux_efi_random_seed { + u32 size; diff --git a/queue-5.4/fuse-add-file_modified-to-fallocate.patch b/queue-5.4/fuse-add-file_modified-to-fallocate.patch new file mode 100644 index 00000000000..2eac978dbb5 --- /dev/null +++ b/queue-5.4/fuse-add-file_modified-to-fallocate.patch @@ -0,0 +1,33 @@ +From 4a6f278d4827b59ba26ceae0ff4529ee826aa258 Mon Sep 17 00:00:00 2001 +From: Miklos Szeredi +Date: Fri, 28 Oct 2022 14:25:20 +0200 +Subject: fuse: add file_modified() to fallocate + +From: Miklos Szeredi + +commit 4a6f278d4827b59ba26ceae0ff4529ee826aa258 upstream. + +Add missing file_modified() call to fuse_file_fallocate(). Without this +fallocate on fuse failed to clear privileges. + +Fixes: 05ba1f082300 ("fuse: add FALLOCATE operation") +Cc: +Signed-off-by: Miklos Szeredi +Signed-off-by: Greg Kroah-Hartman +--- + fs/fuse/file.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/fs/fuse/file.c ++++ b/fs/fuse/file.c +@@ -3239,6 +3239,10 @@ static long fuse_file_fallocate(struct f + goto out; + } + ++ err = file_modified(file); ++ if (err) ++ goto out; ++ + if (!(mode & FALLOC_FL_KEEP_SIZE)) + set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state); + diff --git a/queue-5.4/kprobe-reverse-kp-flags-when-arm_kprobe-failed.patch b/queue-5.4/kprobe-reverse-kp-flags-when-arm_kprobe-failed.patch new file mode 100644 index 00000000000..10900d6a5d0 --- /dev/null +++ b/queue-5.4/kprobe-reverse-kp-flags-when-arm_kprobe-failed.patch @@ -0,0 +1,41 @@ +From 4a6f316d6855a434f56dbbeba05e14c01acde8f8 Mon Sep 17 00:00:00 2001 +From: Li Qiang +Date: Fri, 4 Nov 2022 08:49:31 +0900 +Subject: kprobe: reverse kp->flags when arm_kprobe failed + +From: Li Qiang + +commit 4a6f316d6855a434f56dbbeba05e14c01acde8f8 upstream. + +In aggregate kprobe case, when arm_kprobe failed, +we need set the kp->flags with KPROBE_FLAG_DISABLED again. +If not, the 'kp' kprobe will been considered as enabled +but it actually not enabled. + +Link: https://lore.kernel.org/all/20220902155820.34755-1-liq3ea@163.com/ + +Fixes: 12310e343755 ("kprobes: Propagate error from arm_kprobe_ftrace()") +Cc: stable@vger.kernel.org +Signed-off-by: Li Qiang +Acked-by: Masami Hiramatsu (Google) +Signed-off-by: Masami Hiramatsu (Google) +Signed-off-by: Greg Kroah-Hartman +--- + kernel/kprobes.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/kernel/kprobes.c ++++ b/kernel/kprobes.c +@@ -2199,8 +2199,11 @@ int enable_kprobe(struct kprobe *kp) + if (!kprobes_all_disarmed && kprobe_disabled(p)) { + p->flags &= ~KPROBE_FLAG_DISABLED; + ret = arm_kprobe(p); +- if (ret) ++ if (ret) { + p->flags |= KPROBE_FLAG_DISABLED; ++ if (p != kp) ++ kp->flags |= KPROBE_FLAG_DISABLED; ++ } + } + out: + mutex_unlock(&kprobe_mutex); diff --git a/queue-5.4/perf-x86-intel-add-cooper-lake-stepping-to-isolation_ucodes.patch b/queue-5.4/perf-x86-intel-add-cooper-lake-stepping-to-isolation_ucodes.patch new file mode 100644 index 00000000000..72766c60e61 --- /dev/null +++ b/queue-5.4/perf-x86-intel-add-cooper-lake-stepping-to-isolation_ucodes.patch @@ -0,0 +1,35 @@ +From 6f8faf471446844bb9c318e0340221049d5c19f4 Mon Sep 17 00:00:00 2001 +From: Kan Liang +Date: Mon, 31 Oct 2022 08:45:50 -0700 +Subject: perf/x86/intel: Add Cooper Lake stepping to isolation_ucodes[] + +From: Kan Liang + +commit 6f8faf471446844bb9c318e0340221049d5c19f4 upstream. + +The intel_pebs_isolation quirk checks both model number and stepping. +Cooper Lake has a different stepping (11) than the other Skylake Xeon. +It cannot benefit from the optimization in commit 9b545c04abd4f +("perf/x86/kvm: Avoid unnecessary work in guest filtering"). + +Add the stepping of Cooper Lake into the isolation_ucodes[] table. + +Signed-off-by: Kan Liang +Signed-off-by: Peter Zijlstra (Intel) +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20221031154550.571663-1-kan.liang@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/events/intel/core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/events/intel/core.c ++++ b/arch/x86/events/intel/core.c +@@ -4009,6 +4009,7 @@ static const struct x86_cpu_desc isolati + INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 5, 0x00000000), + INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 6, 0x00000000), + INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 7, 0x00000000), ++ INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 11, 0x00000000), + INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L, 3, 0x0000007c), + INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE, 3, 0x0000007c), + INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 9, 0x0000004e), diff --git a/queue-5.4/perf-x86-intel-fix-pebs-event-constraints-for-icl.patch b/queue-5.4/perf-x86-intel-fix-pebs-event-constraints-for-icl.patch new file mode 100644 index 00000000000..70597b9a6a0 --- /dev/null +++ b/queue-5.4/perf-x86-intel-fix-pebs-event-constraints-for-icl.patch @@ -0,0 +1,41 @@ +From acc5568b90c19ac6375508a93b9676cd18a92a35 Mon Sep 17 00:00:00 2001 +From: Kan Liang +Date: Mon, 31 Oct 2022 08:41:18 -0700 +Subject: perf/x86/intel: Fix pebs event constraints for ICL + +From: Kan Liang + +commit acc5568b90c19ac6375508a93b9676cd18a92a35 upstream. + +According to the latest event list, update the MEM_INST_RETIRED events +which support the DataLA facility. + +Fixes: 6017608936c1 ("perf/x86/intel: Add Icelake support") +Reported-by: Jannis Klinkenberg +Signed-off-by: Kan Liang +Signed-off-by: Peter Zijlstra (Intel) +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20221031154119.571386-1-kan.liang@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/events/intel/ds.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/arch/x86/events/intel/ds.c ++++ b/arch/x86/events/intel/ds.c +@@ -852,8 +852,13 @@ struct event_constraint intel_icl_pebs_e + INTEL_FLAGS_UEVENT_CONSTRAINT(0x0400, 0x800000000ULL), /* SLOTS */ + + INTEL_PLD_CONSTRAINT(0x1cd, 0xff), /* MEM_TRANS_RETIRED.LOAD_LATENCY */ +- INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x1d0, 0xf), /* MEM_INST_RETIRED.LOAD */ +- INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x2d0, 0xf), /* MEM_INST_RETIRED.STORE */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_LOADS */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_STORES */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x21d0, 0xf), /* MEM_INST_RETIRED.LOCK_LOADS */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x41d0, 0xf), /* MEM_INST_RETIRED.SPLIT_LOADS */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x42d0, 0xf), /* MEM_INST_RETIRED.SPLIT_STORES */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x81d0, 0xf), /* MEM_INST_RETIRED.ALL_LOADS */ ++ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x82d0, 0xf), /* MEM_INST_RETIRED.ALL_STORES */ + + INTEL_FLAGS_EVENT_CONSTRAINT_DATALA_LD_RANGE(0xd1, 0xd4, 0xf), /* MEM_LOAD_*_RETIRED.* */ + diff --git a/queue-5.4/series b/queue-5.4/series index 1dacc7152ad..9464d75ecee 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -47,3 +47,11 @@ memcg-enable-accounting-of-ipc-resources.patch binder-fix-uaf-of-alloc-vma-in-race-with-munmap.patch btrfs-fix-type-of-parameter-generation-in-btrfs_get_dentry.patch tcp-udp-make-early_demux-back-namespacified.patch +kprobe-reverse-kp-flags-when-arm_kprobe-failed.patch +tools-nolibc-string-fix-memcmp-implementation.patch +tracing-histogram-update-document-for-keys_max-size.patch +capabilities-fix-potential-memleak-on-error-path-from-vfs_getxattr_alloc.patch +fuse-add-file_modified-to-fallocate.patch +efi-random-reduce-seed-size-to-32-bytes.patch +perf-x86-intel-fix-pebs-event-constraints-for-icl.patch +perf-x86-intel-add-cooper-lake-stepping-to-isolation_ucodes.patch diff --git a/queue-5.4/tools-nolibc-string-fix-memcmp-implementation.patch b/queue-5.4/tools-nolibc-string-fix-memcmp-implementation.patch new file mode 100644 index 00000000000..b7b765d98d3 --- /dev/null +++ b/queue-5.4/tools-nolibc-string-fix-memcmp-implementation.patch @@ -0,0 +1,45 @@ +From b3f4f51ea68a495f8a5956064c33dce711a2df91 Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Fri, 21 Oct 2022 08:01:53 +0200 +Subject: tools/nolibc/string: Fix memcmp() implementation + +From: Rasmus Villemoes + +commit b3f4f51ea68a495f8a5956064c33dce711a2df91 upstream. + +The C standard says that memcmp() must treat the buffers as consisting +of "unsigned chars". If char happens to be unsigned, the casts are ok, +but then obviously the c1 variable can never contain a negative +value. And when char is signed, the casts are wrong, and there's still +a problem with using an 8-bit quantity to hold the difference, because +that can range from -255 to +255. + +For example, assuming char is signed, comparing two 1-byte buffers, +one containing 0x00 and another 0x80, the current implementation would +return -128 for both memcmp(a, b, 1) and memcmp(b, a, 1), whereas one +of those should of course return something positive. + +Signed-off-by: Rasmus Villemoes +Fixes: 66b6f755ad45 ("rcutorture: Import a copy of nolibc") +Cc: stable@vger.kernel.org # v5.0+ +Signed-off-by: Willy Tarreau +Signed-off-by: Paul E. McKenney +Signed-off-by: Greg Kroah-Hartman +--- + tools/include/nolibc/nolibc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/include/nolibc/nolibc.h ++++ b/tools/include/nolibc/nolibc.h +@@ -2318,9 +2318,9 @@ static __attribute__((unused)) + int memcmp(const void *s1, const void *s2, size_t n) + { + size_t ofs = 0; +- char c1 = 0; ++ int c1 = 0; + +- while (ofs < n && !(c1 = ((char *)s1)[ofs] - ((char *)s2)[ofs])) { ++ while (ofs < n && !(c1 = ((unsigned char *)s1)[ofs] - ((unsigned char *)s2)[ofs])) { + ofs++; + } + return c1; diff --git a/queue-5.4/tracing-histogram-update-document-for-keys_max-size.patch b/queue-5.4/tracing-histogram-update-document-for-keys_max-size.patch new file mode 100644 index 00000000000..00e2179d879 --- /dev/null +++ b/queue-5.4/tracing-histogram-update-document-for-keys_max-size.patch @@ -0,0 +1,33 @@ +From a635beeacc6d56d2b71c39e6c0103f85b53d108e Mon Sep 17 00:00:00 2001 +From: Zheng Yejian +Date: Mon, 17 Oct 2022 10:38:06 +0000 +Subject: tracing/histogram: Update document for KEYS_MAX size + +From: Zheng Yejian + +commit a635beeacc6d56d2b71c39e6c0103f85b53d108e upstream. + +After commit 4f36c2d85ced ("tracing: Increase tracing map KEYS_MAX size"), +'keys' supports up to three fields. + +Signed-off-by: Zheng Yejian +Cc: stable@vger.kernel.org +Acked-by: Masami Hiramatsu (Google) +Link: https://lore.kernel.org/r/20221017103806.2479139-1-zhengyejian1@huawei.com +Signed-off-by: Jonathan Corbet +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/trace/histogram.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/trace/histogram.rst ++++ b/Documentation/trace/histogram.rst +@@ -39,7 +39,7 @@ Documentation written by Tom Zanussi + will use the event's kernel stacktrace as the key. The keywords + 'keys' or 'key' can be used to specify keys, and the keywords + 'values', 'vals', or 'val' can be used to specify values. Compound +- keys consisting of up to two fields can be specified by the 'keys' ++ keys consisting of up to three fields can be specified by the 'keys' + keyword. Hashing a compound key produces a unique entry in the + table for each unique combination of component keys, and can be + useful for providing more fine-grained summaries of event data.