summaryrefslogtreecommitdiff
path: root/fs/pstore
diff options
context:
space:
mode:
authorQiujun Huang <hqjagain@gmail.com>2022-09-04 23:17:13 +0800
committerKees Cook <keescook@chromium.org>2022-10-17 13:14:10 -0700
commit99b3b837855b987563bcfb397cf9ddd88262814b (patch)
treebc4e3256371cfb06ceba597c28a2e8b61048d512 /fs/pstore
parent9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff)
pstore/zone: Use GFP_ATOMIC to allocate zone buffer
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
Diffstat (limited to 'fs/pstore')
-rw-r--r--fs/pstore/zone.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c
index 017d0d4ad329..2770746bb7aa 100644
--- a/fs/pstore/zone.c
+++ b/fs/pstore/zone.c
@@ -761,7 +761,7 @@ static inline int notrace psz_kmsg_write_record(struct psz_context *cxt,
/* 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;