5.15-stable patches

added patches:
	hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch
	pstore-properly-assign-mem_type-property.patch
	pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch

diff --git a/queue-5.15/hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch b/queue-5.15/hfsplus-fix-bug-causing-custom-uid-and-gid-being-unable-to-be-assigned-with-mount.patch
new file mode 100644 (file)
index 0000000..e310d9f
--- /dev/null
+++ b/queue-5.15/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 <gargaditya08@live.com>
+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 <gargaditya08@live.com>
+
+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 <gargaditya08@live.com>
+Reviewed-by: Viacheslav Dubeyko <slava@dubeyko.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -190,11 +190,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.15/pstore-properly-assign-mem_type-property.patch b/queue-5.15/pstore-properly-assign-mem_type-property.patch
new file mode 100644 (file)
index 0000000..d3b34e8
--- /dev/null
+++ b/queue-5.15/pstore-properly-assign-mem_type-property.patch
@@ -0,0 +1,42 @@
+From beca3e311a49cd3c55a056096531737d7afa4361 Mon Sep 17 00:00:00 2001
+From: Luca Stefani <luca@osomprivacy.com>
+Date: Thu, 22 Dec 2022 14:10:49 +0100
+Subject: pstore: Properly assign mem_type property
+
+From: Luca Stefani <luca@osomprivacy.com>
+
+commit beca3e311a49cd3c55a056096531737d7afa4361 upstream.
+
+If mem-type is specified in the device tree
+it would end up overriding the record_size
+field instead of populating mem_type.
+
+As record_size is currently parsed after the
+improper assignment with default size 0 it
+continued to work as expected regardless of the
+value found in the device tree.
+
+Simply changing the target field of the struct
+is enough to get mem-type working as expected.
+
+Fixes: 9d843e8fafc7 ("pstore: Add mem_type property DT parsing support")
+Cc: stable@vger.kernel.org
+Signed-off-by: Luca Stefani <luca@osomprivacy.com>
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Link: https://lore.kernel.org/r/20221222131049.286288-1-luca@osomprivacy.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/pstore/ram.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/pstore/ram.c
++++ b/fs/pstore/ram.c
+@@ -670,7 +670,7 @@ static int ramoops_parse_dt(struct platf
+               field = value;                                          \
+       }
+ 
+-      parse_u32("mem-type", pdata->record_size, pdata->mem_type);
++      parse_u32("mem-type", pdata->mem_type, pdata->mem_type);
+       parse_u32("record-size", pdata->record_size, 0);
+       parse_u32("console-size", pdata->console_size, 0);
+       parse_u32("ftrace-size", pdata->ftrace_size, 0);

diff --git a/queue-5.15/pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch b/queue-5.15/pstore-zone-use-gfp_atomic-to-allocate-zone-buffer.patch
new file mode 100644 (file)
index 0000000..13758ab
--- /dev/null
+++ b/queue-5.15/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 <hqjagain@gmail.com>
+Date: Sun, 4 Sep 2022 23:17:13 +0800
+Subject: pstore/zone: Use GFP_ATOMIC to allocate zone buffer
+
+From: Qiujun Huang <hqjagain@gmail.com>
+
+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 <hqjagain@gmail.com>
+Fixes: 335426c6dcdd ("pstore/zone: Provide way to skip "broken" zone for MTD devices")
+Cc: WeiXiong Liao <gmpy.liaowx@gmail.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Link: https://lore.kernel.org/r/CAJRQjofRCF7wjrYmw3D7zd5QZnwHQq+F8U-mJDJ6NZ4bddYdLA@mail.gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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.15/series b/queue-5.15/series
index b98929886ca5e36b9ce1ae947b274a3465ba8e01..3c879bac8e90aff50c00c9b929044e485f220a35 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -33,3 +33,6 @@ 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-properly-assign-mem_type-property.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