Message ID | 1354890498-6448-10-git-send-email-paul.gortmaker@windriver.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 0df42fa..38613cf 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1551,7 +1551,8 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags) u32 new_ref = new_tport->ref; struct tipc_msg *msg = buf_msg(buf); - lock_sock(new_sk); + /* we lock on new_sk; but lockdep sees the lock on sk */ + lock_sock_nested(new_sk, SINGLE_DEPTH_NESTING); /* * Reject any stray messages received by new socket