From: Greg Kroah-Hartman Date: Mon, 2 Jan 2023 10:42:46 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v6.0.17~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4477e2467ecc4253955404e87d875991a05459da;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch --- diff --git a/queue-5.10/hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch b/queue-5.10/hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch new file mode 100644 index 00000000000..32c7bf3acb4 --- /dev/null +++ b/queue-5.10/hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch @@ -0,0 +1,71 @@ +From 9f2b5debc07073e6dfdd774e3594d0224b991927 Mon Sep 17 00:00:00 2001 +From: Aditya Garg +Date: Wed, 7 Dec 2022 03:05:40 +0000 +Subject: hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount + +From: Aditya Garg + +commit 9f2b5debc07073e6dfdd774e3594d0224b991927 upstream. + +Despite specifying UID and GID in mount command, the specified UID and GID +were not being assigned. This patch fixes this issue. + +Link: https://lkml.kernel.org/r/C0264BF5-059C-45CF-B8DA-3A3BD2C803A2@live.com +Signed-off-by: Aditya Garg +Reviewed-by: Viacheslav Dubeyko +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/hfsplus/hfsplus_fs.h | 2 ++ + fs/hfsplus/inode.c | 4 ++-- + fs/hfsplus/options.c | 4 ++++ + 3 files changed, 8 insertions(+), 2 deletions(-) + +--- a/fs/hfsplus/hfsplus_fs.h ++++ b/fs/hfsplus/hfsplus_fs.h +@@ -198,6 +198,8 @@ struct hfsplus_sb_info { + #define HFSPLUS_SB_HFSX 3 + #define HFSPLUS_SB_CASEFOLD 4 + #define HFSPLUS_SB_NOBARRIER 5 ++#define HFSPLUS_SB_UID 6 ++#define HFSPLUS_SB_GID 7 + + static inline struct hfsplus_sb_info *HFSPLUS_SB(struct super_block *sb) + { +--- a/fs/hfsplus/inode.c ++++ b/fs/hfsplus/inode.c +@@ -187,11 +187,11 @@ static void hfsplus_get_perms(struct ino + mode = be16_to_cpu(perms->mode); + + i_uid_write(inode, be32_to_cpu(perms->owner)); +- if (!i_uid_read(inode) && !mode) ++ if ((test_bit(HFSPLUS_SB_UID, &sbi->flags)) || (!i_uid_read(inode) && !mode)) + inode->i_uid = sbi->uid; + + i_gid_write(inode, be32_to_cpu(perms->group)); +- if (!i_gid_read(inode) && !mode) ++ if ((test_bit(HFSPLUS_SB_GID, &sbi->flags)) || (!i_gid_read(inode) && !mode)) + inode->i_gid = sbi->gid; + + if (dir) { +--- a/fs/hfsplus/options.c ++++ b/fs/hfsplus/options.c +@@ -140,6 +140,8 @@ int hfsplus_parse_options(char *input, s + if (!uid_valid(sbi->uid)) { + pr_err("invalid uid specified\n"); + return 0; ++ } else { ++ set_bit(HFSPLUS_SB_UID, &sbi->flags); + } + break; + case opt_gid: +@@ -151,6 +153,8 @@ int hfsplus_parse_options(char *input, s + if (!gid_valid(sbi->gid)) { + pr_err("invalid gid specified\n"); + return 0; ++ } else { ++ set_bit(HFSPLUS_SB_GID, &sbi->flags); + } + break; + case opt_part: diff --git a/queue-5.10/pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch b/queue-5.10/pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch new file mode 100644 index 00000000000..13758abb427 --- /dev/null +++ b/queue-5.10/pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch @@ -0,0 +1,36 @@ +From 99b3b837855b987563bcfb397cf9ddd88262814b Mon Sep 17 00:00:00 2001 +From: Qiujun Huang +Date: Sun, 4 Sep 2022 23:17:13 +0800 +Subject: pstore/zone: Use GFP_ATOMIC to allocate zone buffer + +From: Qiujun Huang + +commit 99b3b837855b987563bcfb397cf9ddd88262814b upstream. + +There is a case found when triggering a panic_on_oom, pstore fails to dump +kmsg. Because psz_kmsg_write_record can't get the new buffer. + +Handle this by using GFP_ATOMIC to allocate a buffer at lower watermark. + +Signed-off-by: Qiujun Huang +Fixes: 335426c6dcdd ("pstore/zone: Provide way to skip "broken" zone for MTD devices") +Cc: WeiXiong Liao +Cc: stable@vger.kernel.org +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/CAJRQjofRCF7wjrYmw3D7zd5QZnwHQq+F8U-mJDJ6NZ4bddYdLA@mail.gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + fs/pstore/zone.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/pstore/zone.c ++++ b/fs/pstore/zone.c +@@ -761,7 +761,7 @@ static inline int notrace psz_kmsg_write + /* avoid destroying old data, allocate a new one */ + len = zone->buffer_size + sizeof(*zone->buffer); + zone->oldbuf = zone->buffer; +- zone->buffer = kzalloc(len, GFP_KERNEL); ++ zone->buffer = kzalloc(len, GFP_ATOMIC); + if (!zone->buffer) { + zone->buffer = zone->oldbuf; + return -ENOMEM; diff --git a/queue-5.10/series b/queue-5.10/series index cfc3894e433..4ea5e3bc002 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -582,3 +582,5 @@ powerpc-rtas-avoid-device-tree-lookups-in-rtas_os_te.patch powerpc-rtas-avoid-scheduling-in-rtas_os_term.patch hid-multitouch-fix-asus-expertbook-p2-p2451fa-trackp.patch hid-plantronics-additional-pids-for-double-volume-ke.patch +pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch +hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch