Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38325036 authored by Tom Herbert's avatar Tom Herbert Committed by Greg Kroah-Hartman
Browse files

kcm: Call strp_stop before strp_done in kcm_attach 



commit dff8baa261174de689a44572d0ea182d7aa70598 upstream.

In kcm_attach strp_done is called when sk_user_data is already
set to fail the attach. strp_done needs the strp to be stopped and
warns if it isn't. Call strp_stop in this case to eliminate the
warning message.

Reported-by: default avatar <syzbot+88dfb55e4c8b770d86e3@syzkaller.appspotmail.com>
Fixes: e5571240236c5652f ("kcm: Check if sk_user_data already set in kcm_attach"
Signed-off-by: default avatarTom Herbert <tom@quantonium.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1899f679

net/kcm/kcmsock.c

+1 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,7 @@ static int kcm_attach(struct socket *sock, struct socket *csock, 
	 */

	if (csk->sk_user_data) {

		write_unlock_bh(&csk->sk_callback_lock);

		strp_stop(&psock->strp);

		strp_done(&psock->strp);

		kmem_cache_free(kcm_psockp, psock);

		err = -EALREADY;