From df52952785cd5f2aa37e95a3eca1ee56f6d74d33 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 5 Jan 2022 15:58:12 +0100 Subject: [PATCH] 5.15-stable patches added patches: fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch --- ...-cookie-is-valid-before-accessing-it.patch | 33 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-5.15/fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch create mode 100644 queue-5.15/series diff --git a/queue-5.15/fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch b/queue-5.15/fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch new file mode 100644 index 00000000000..8d7bee8df47 --- /dev/null +++ b/queue-5.15/fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch @@ -0,0 +1,33 @@ +From 0dc54bd4d6e03be1f0b678c4297170b79f1a44ab Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Wed, 3 Nov 2021 17:34:05 +0900 +Subject: fscache_cookie_enabled: check cookie is valid before accessing it + +From: Dominique Martinet + +commit 0dc54bd4d6e03be1f0b678c4297170b79f1a44ab upstream. + +fscache_cookie_enabled() could be called on NULL cookies and cause a +null pointer dereference when accessing cookie flags: just make sure +the cookie is valid first + +Suggested-by: David Howells +Acked-by: David Howells +Signed-off-by: Dominique Martinet +Cc: Jeffrey E Altman +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/fscache.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/fscache.h ++++ b/include/linux/fscache.h +@@ -167,7 +167,7 @@ struct fscache_cookie { + + static inline bool fscache_cookie_enabled(struct fscache_cookie *cookie) + { +- return test_bit(FSCACHE_COOKIE_ENABLED, &cookie->flags); ++ return fscache_cookie_valid(cookie) && test_bit(FSCACHE_COOKIE_ENABLED, &cookie->flags); + } + + /* diff --git a/queue-5.15/series b/queue-5.15/series new file mode 100644 index 00000000000..7fc268c9807 --- /dev/null +++ b/queue-5.15/series @@ -0,0 +1 @@ +fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch -- 2.47.3