summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2021-11-03 17:34:05 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-11 15:35:11 +0100
commitef3047fca111b6f3ef5d63dd8eb177df94dc2997 (patch)
tree69d5f7f5990b075f6a743bb25c4359495acca1dd /include
parent734eb1fd2073f503f5c6b44f1c0d453ca6986b84 (diff)
fscache_cookie_enabled: check cookie is valid before accessing it
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 <dhowells@redhat.com> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> Cc: Jeffrey E Altman <jaltman@auristor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fscache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index a4dab5998613..3b2282c157f7 100644
--- 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);
}
/*