From 01943e0278afc63121093a88b1afa597b30680c5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 4 Feb 2022 10:42:14 +0100 Subject: [PATCH] 5.15-stable patches added patches: ovl-fix-null-pointer-dereference-in-copy-up-warning.patch --- ...inter-dereference-in-copy-up-warning.patch | 41 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-5.15/ovl-fix-null-pointer-dereference-in-copy-up-warning.patch diff --git a/queue-5.15/ovl-fix-null-pointer-dereference-in-copy-up-warning.patch b/queue-5.15/ovl-fix-null-pointer-dereference-in-copy-up-warning.patch new file mode 100644 index 00000000000..f3d0c2c99a6 --- /dev/null +++ b/queue-5.15/ovl-fix-null-pointer-dereference-in-copy-up-warning.patch @@ -0,0 +1,41 @@ +From 4ee7e4a6c9b298da44029ed9ec8ed23ae49cc209 Mon Sep 17 00:00:00 2001 +From: Christoph Fritz +Date: Wed, 12 Jan 2022 19:33:21 +0100 +Subject: ovl: fix NULL pointer dereference in copy up warning + +From: Christoph Fritz + +commit 4ee7e4a6c9b298da44029ed9ec8ed23ae49cc209 upstream. + +This patch is fixing a NULL pointer dereference to get a recently +introduced warning message working. + +Fixes: 5b0a414d06c3 ("ovl: fix filattr copy-up failure") +Signed-off-by: Christoph Fritz +Cc: # v5.15 +Signed-off-by: Miklos Szeredi +Signed-off-by: Greg Kroah-Hartman +--- + fs/overlayfs/copy_up.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/fs/overlayfs/copy_up.c ++++ b/fs/overlayfs/copy_up.c +@@ -145,7 +145,7 @@ static int ovl_copy_fileattr(struct inod + if (err == -ENOTTY || err == -EINVAL) + return 0; + pr_warn("failed to retrieve lower fileattr (%pd2, err=%i)\n", +- old, err); ++ old->dentry, err); + return err; + } + +@@ -178,7 +178,7 @@ static int ovl_copy_fileattr(struct inod + return 0; + } + pr_warn("failed to retrieve upper fileattr (%pd2, err=%i)\n", +- new, err); ++ new->dentry, err); + return err; + } + diff --git a/queue-5.15/series b/queue-5.15/series index ac17aa412bd..603e37442ab 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -30,3 +30,4 @@ cpuset-fix-the-bug-that-subpart_cpus-updated-wrongly-in-update_cpumask.patch e1000e-handshake-with-csme-starts-from-adl-platforms.patch af_packet-fix-data-race-in-packet_setsockopt-packet_setsockopt.patch tcp-add-missing-tcp_skb_can_collapse-test-in-tcp_shift_skb_data.patch +ovl-fix-null-pointer-dereference-in-copy-up-warning.patch -- 2.47.3