diff mbox series

[RESEND] watch_queue: fix IOC_WATCH_QUEUE_SET_SIZE alloc error paths

Message ID 20220520223758.32548-1-ddiss@suse.de (mailing list archive)
State New, archived
Headers show
Series [RESEND] watch_queue: fix IOC_WATCH_QUEUE_SET_SIZE alloc error paths | expand

Commit Message

David Disseldorp May 20, 2022, 10:37 p.m. UTC
From code inspection, the watch_queue_set_size() allocation error paths
return the ret value set via the prior pipe_resize_ring() call, which
will always be zero.

Fixes: c73be61cede58 ("pipe: Add general notification queue support")
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
 kernel/watch_queue.c | 1 +
 1 file changed, 1 insertion(+)
diff mbox series

Patch

diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c
index 230038d4f908..a89a65954ce1 100644
--- a/kernel/watch_queue.c
+++ b/kernel/watch_queue.c
@@ -248,6 +248,7 @@  long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)
 	if (ret < 0)
 		goto error;
 
+	ret = -ENOMEM;
 	pages = kcalloc(sizeof(struct page *), nr_pages, GFP_KERNEL);
 	if (!pages)
 		goto error;