From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5041C282C4 for ; Mon, 4 Feb 2019 16:36:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A8C020823 for ; Mon, 4 Feb 2019 16:36:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fV3OCdYs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731804AbfBDQgL (ORCPT ); Mon, 4 Feb 2019 11:36:11 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39741 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729505AbfBDQgK (ORCPT ); Mon, 4 Feb 2019 11:36:10 -0500 Received: by mail-pg1-f195.google.com with SMTP id r11so151633pgp.6 for ; Mon, 04 Feb 2019 08:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5x9evYPg5Emnhll+icwXS9YYgBkokz7CrignCHFv04M=; b=fV3OCdYserAy/roN0B5RIYCOylDrV45jEPeVPxw7blgS9qjcCg0ao0T1vDPG6RITGc 4XmEmMACbQBrJP8gRjEZ1RKpFeRdq8dG6PrbXSN/pzYiEY5CwoYhThStSkCRGOa6nxvL Vamf1E2u+e+F/klBA32tQHGum6RISJ6TRUsnAMPa5o3vD4YDHCZvDvCiMzmy0z64kwVR s4cgWZL4OO/GRQ62qcPjNSubuBDJU1Vp879s7NbcDv4h5WoLVjD/kL8JM40dpeCMrCLZ z5KdKrx12Kia+OpcxCzaHOJJkemSIG6eDzkKODqmrbKehj09F2iJnXWqF9TQHtucLxPV 1MYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5x9evYPg5Emnhll+icwXS9YYgBkokz7CrignCHFv04M=; b=OXqICS0pVRoZhCXUF6mX4oL4UHaXZgS3f02/AIZ5xPZM03LoxrxjkHHQKqxs9XQ36L xLWrEDpGY+Bp1Tnj3qUapQGgJ7n7yJOxufSAFuCteBuXsVCZl2lkvFj+aagVFLnazJAu 5SIKAq3B0KqIzL1S+fDD5bE91T6E02nIM5bpHtBjddngkNq54iaNTUC8LG4R1NFK/Xgh hP8FlB+nDYhKwR6aZ3b6M8sVgU7XBxEKC5+TrkMTZdz+nAOFIg80AuQeJwZmHOH285gQ THlxdYvpkLKCxe/qJSb5nBaSetZOvFspnya2y5ZyTLNO8iUHVjTvud05zU1Y0lYurzqY svrw== X-Gm-Message-State: AHQUAub4Q8B56lIdpaMTOlgUuNZOE2ZaCFdGmgGccqQUQdf5eAsrCym/ vzTxDBpyfuXjHTSekZF/0/oOUg== X-Google-Smtp-Source: AHgI3IZn7BGR6ht+iv5hkTTeBz+dguO0OreOZbA6liwvjjg//STb9/rTLzFcmtpsJAVvOlyVMNCW8w== X-Received: by 2002:a63:a112:: with SMTP id b18mr228052pgf.440.1549298169386; Mon, 04 Feb 2019 08:36:09 -0800 (PST) Received: from localhost ([2620:15c:2c4:201:f5a:7eca:440a:3ead]) by smtp.gmail.com with ESMTPSA id g26sm622950pfh.61.2019.02.04.08.36.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Feb 2019 08:36:08 -0800 (PST) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , David Howells , syzbot Subject: [PATCH net] rxrpc: bad unlock balance in rxrpc_recvmsg Date: Mon, 4 Feb 2019 08:36:06 -0800 Message-Id: <20190204163606.236419-1-edumazet@google.com> X-Mailer: git-send-email 2.20.1.611.gfbb209baf1-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When either "goto wait_interrupted;" or "goto wait_error;" paths are taken, socket lock has already been released. This patch fixes following syzbot splat : WARNING: bad unlock balance detected! 5.0.0-rc4+ #59 Not tainted ------------------------------------- syz-executor223/8256 is trying to release lock (sk_lock-AF_RXRPC) at: [] rxrpc_recvmsg+0x6d3/0x3099 net/rxrpc/recvmsg.c:598 but there are no more locks to release! other info that might help us debug this: 1 lock held by syz-executor223/8256: #0: 00000000fa9ed0f4 (slock-AF_RXRPC){+...}, at: spin_lock_bh include/linux/spinlock.h:334 [inline] #0: 00000000fa9ed0f4 (slock-AF_RXRPC){+...}, at: release_sock+0x20/0x1c0 net/core/sock.c:2798 stack backtrace: CPU: 1 PID: 8256 Comm: syz-executor223 Not tainted 5.0.0-rc4+ #59 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x172/0x1f0 lib/dump_stack.c:113 print_unlock_imbalance_bug kernel/locking/lockdep.c:3391 [inline] print_unlock_imbalance_bug.cold+0x114/0x123 kernel/locking/lockdep.c:3368 __lock_release kernel/locking/lockdep.c:3601 [inline] lock_release+0x67e/0xa00 kernel/locking/lockdep.c:3860 sock_release_ownership include/net/sock.h:1471 [inline] release_sock+0x183/0x1c0 net/core/sock.c:2808 rxrpc_recvmsg+0x6d3/0x3099 net/rxrpc/recvmsg.c:598 sock_recvmsg_nosec net/socket.c:794 [inline] sock_recvmsg net/socket.c:801 [inline] sock_recvmsg+0xd0/0x110 net/socket.c:797 __sys_recvfrom+0x1ff/0x350 net/socket.c:1845 __do_sys_recvfrom net/socket.c:1863 [inline] __se_sys_recvfrom net/socket.c:1859 [inline] __x64_sys_recvfrom+0xe1/0x1a0 net/socket.c:1859 do_syscall_64+0x103/0x610 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x446379 Code: e8 2c b3 02 00 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 2b 09 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fe5da89fd98 EFLAGS: 00000246 ORIG_RAX: 000000000000002d RAX: ffffffffffffffda RBX: 00000000006dbc28 RCX: 0000000000446379 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003 RBP: 00000000006dbc20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006dbc2c R13: 0000000000000000 R14: 0000000000000000 R15: 20c49ba5e353f7cf Fixes: 248f219cb8bc ("rxrpc: Rewrite the data and ack handling code") Signed-off-by: Eric Dumazet Cc: David Howells Reported-by: syzbot --- net/rxrpc/recvmsg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index eaf19ebaa964e6442cfa4117f862fb4aca9b2345..3f7bb11f3290e57fe27007cb2ce57936f6ae47f4 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -596,6 +596,7 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, } error_no_call: release_sock(&rx->sk); +error_trace: trace_rxrpc_recvmsg(call, rxrpc_recvmsg_return, 0, 0, 0, ret); return ret; @@ -604,7 +605,7 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, wait_error: finish_wait(sk_sleep(&rx->sk), &wait); call = NULL; - goto error_no_call; + goto error_trace; } /** -- 2.20.1.611.gfbb209baf1-goog