kcm: Fix unnecessary psock unreservation.
authorDavid Howells <dhowells@redhat.com>
Thu, 15 Jun 2023 11:32:02 +0000 (12:32 +0100)
committerJakub Kicinski <kuba@kernel.org>
Sat, 17 Jun 2023 07:08:27 +0000 (00:08 -0700)
commit9f8d0dc0ec4a4b5b78c0be83238c4511ff5f1ae0
tree18016d5e845ae50ddd9200f97793cee5b30faf2b
parent5a6f6873606e03a0a95afe40ba5e84bb6e28a26f
kcm: Fix unnecessary psock unreservation.

kcm_write_msgs() calls unreserve_psock() to release its hold on the
underlying TCP socket if it has run out of things to transmit, but if we
have nothing in the write queue on entry (e.g. because someone did a
zero-length sendmsg), we don't actually go into the transmission loop and
as a consequence don't call reserve_psock().

Fix this by skipping the call to unreserve_psock() if we didn't reserve a
psock.

Fixes: c31a25e1db48 ("kcm: Send multiple frags in one sendmsg()")
Reported-by: syzbot+dd1339599f1840e4cc65@syzkaller.appspotmail.com
Link: https://lore.kernel.org/r/000000000000a61ffe05fe0c3d08@google.com/
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: syzbot+dd1339599f1840e4cc65@syzkaller.appspotmail.com
cc: Tom Herbert <tom@herbertland.com>
cc: Tom Herbert <tom@quantonium.net>
cc: Jens Axboe <axboe@kernel.dk>
cc: Matthew Wilcox <willy@infradead.org>
Link: https://lore.kernel.org/r/20787.1686828722@warthog.procyon.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/kcm/kcmsock.c