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

Commit d5902f6d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'strparser-Fix-lockdep-issue' 



Tom Herbert says:

====================
strparser: Fix lockdep issue

When sock_owned_by_user returns true in strparser. Fix is to add and
call sock_owned_by_user_nocheck since the check for owned by user is
not an error condition in this case.
====================

Fixes: 43a0c675 ("strparser: Stream parser for messages")
Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
Reported-and-tested-by: default avatar <syzbot+c91c53af67f9ebe599a337d2e70950366153b295@syzkaller.appspotmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f72c4ac6 d66fa9ec

include/net/sock.h

+5 −0
Original line number Diff line number Diff line
@@ -1514,6 +1514,11 @@ static inline bool sock_owned_by_user(const struct sock *sk) 
	return sk->sk_lock.owned;

}



static inline bool sock_owned_by_user_nocheck(const struct sock *sk)

{

	return sk->sk_lock.owned;

}



/* no reclassification while locks are held */

static inline bool sock_allow_reclassification(const struct sock *csk)

{

net/strparser/strparser.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ void strp_data_ready(struct strparser *strp) 
	 * allows a thread in BH context to safely check if the process

	 * lock is held. In this case, if the lock is held, queue work.

	 */

	if (sock_owned_by_user(strp->sk)) {

	if (sock_owned_by_user_nocheck(strp->sk)) {

		queue_work(strp_wq, &strp->work);

		return;

	}