watch_queue: fix IOC_WATCH_QUEUE_SET_SIZE alloc error paths
authorDavid Disseldorp <ddiss@suse.de>
Tue, 7 Mar 2023 15:21:06 +0000 (16:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2023 07:48:59 +0000 (08:48 +0100)
commitb43cb0f087676db71a7baf3bec65b6439353b10d
tree662b4f7dbc1dc10ef21a7ef0e354bbd87f64c712
parentd15c9ae1c6d9940a7e5d5daaa25c88104ea9a595
watch_queue: fix IOC_WATCH_QUEUE_SET_SIZE alloc error paths

[ Upstream commit 03e1d60e177eedbd302b77af4ea5e21b5a7ade31 ]

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.

As a result, IOC_WATCH_QUEUE_SET_SIZE callers such as "keyctl watch"
fail to detect kernel wqueue->notes allocation failures and proceed to
KEYCTL_WATCH_KEY, with any notifications subsequently lost.

Fixes: c73be61cede58 ("pipe: Add general notification queue support")
Signed-off-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/watch_queue.c