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: 43a0c6751a
("strparser: Stream parser for messages")
Reported-by: syzbot <syzkaller@googlegroups.com>
Reported-and-tested-by: <syzbot+c91c53af67f9ebe599a337d2e70950366153b295@syzkaller.appspotmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
d5902f6d1f
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue