Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp575900pxb; Sat, 21 Aug 2021 11:12:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxO2N1kPG0w9uGVKKe02mrmDN1dnJvXPmsOyphpuZykggJ8eb6+WCKbMVwCzaJcYry5DaeM X-Received: by 2002:a05:6638:2b1:: with SMTP id d17mr21570246jaq.63.1629569565918; Sat, 21 Aug 2021 11:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629569565; cv=none; d=google.com; s=arc-20160816; b=gXRZp4ZyCgNq/1Dwpz187WoRT0QX9i+dkDO+w2WPBcErlH8DmLoIbbjGDP5BfgTI52 TOovQ7cKjGiI55If+c8Pz5Tr3xJrqgdJbOdcYQ0fYiTfJXUMujIl3XX0EmZEW+l48o67 N2RA5fow2nDL4dnvqUzyldnJvi8ihPQ1Q5PqK4kdXBtBIBFWPSZH0f4Y2UNLvAtvm+5l 5SXcfCVucICkBul5EKUkaH33Mmd67r5eCSWqqIuEIu/Jn4Wiv5QxW9OEbLPaNk7Q0Ybm RBSP3Hz/K1aiolCHApF+h8yFyAxeNIIgOum51ac2OzNQs2F1efFGt63aZvZWuYwHxuMG qlJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8GJsXQuTpKR2wbHDfP7I1D/01uKb8jZNCY+DWhBzgmo=; b=ykShbVNJxywANXxNmf6f5ZqdIHgv7klfUDAviOhqMiQBYhRTMKFLWijJN2RDr48E3U piXHaeCrPpIbDpbx61/KweWegdt+yUF+ay6CcbA7X/sNOtPAX9ATit1+rdZgG5NsXDyD eUUajLlWDiidiHrTCLHOn3DjYKNYGx51lsvGu2GnQWiMIDo46VVWlL/82gsvyu/kz2Vt 3vWu4MKbeDVKFP3+2aJ95leap2NhQy3ktOXfHw+74aEFd8r2XoiTRY5Pv+TP17k0mjJv zU+ER4C8NSb2N4bWouw6KlUp3QD02uYBUBmLrNhVcfh9/xonmCpHUZbkvJ4BFDtjLiqo 2oLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=TIB+RBAg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bytedance.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g14si11500380jat.28.2021.08.21.11.12.21; Sat, 21 Aug 2021 11:12:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=TIB+RBAg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230419AbhHUSId (ORCPT + 99 others); Sat, 21 Aug 2021 14:08:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbhHUSId (ORCPT ); Sat, 21 Aug 2021 14:08:33 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45DF1C061756 for ; Sat, 21 Aug 2021 11:07:53 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id c17so12485228pgc.0 for ; Sat, 21 Aug 2021 11:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8GJsXQuTpKR2wbHDfP7I1D/01uKb8jZNCY+DWhBzgmo=; b=TIB+RBAgH2h2zSki63S+WYlw3AyD3MPcXf0osPvAucaDGEClyzYSEiH2OLT6cAE7+U O4ekTzJhQ2rj6aA6mdvWqF9pKqq9sLBxz5BNDn04HlXBcZ2oOt/khfZyJF5b29c/e2he hd5PsYah1pEx9nGWZDNfz+IMmUckPALs1wq2tI+oNDWTbQaRH5V9wL2+wdfGrULX8P9c pOnxnJzMfq32VcsDmelDCfyG9Gymgd6XD2yoVWBgDY47nR16YUQkE8yaMmWER80D0Bh7 fkB3G271uCIe6KZIvl1BMvaUxaiKuN/hIi8DGQ2Gk5I7s7W0DMNdAlJR4UsoRE9Ktt/S K/ng== 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=8GJsXQuTpKR2wbHDfP7I1D/01uKb8jZNCY+DWhBzgmo=; b=LVTY6H90UfZrVaC2EwHQkmsW+0OsLuW40ePqCv1J9TwchxsFq8Ju5xUfePa7EH0uff 240CiU6upRSs49ja5SAypvROAzCVH90Ic8rM39SXL+XasB4fMsJz+rD2cNWe+r/e7Q3L vWP37u43l2oNpIaDtEz+lwYjOWJ7pY7QWn2AmsloR5hXENrxFhLigi7gKZ2HEJmE4aHH UR6IguUHeqWv4JgOhOMKsk+i8A3Q5JqEBr6xZc9Y7Wemdupl6xUO9QBLI95Cms03owy6 WX56ZUJec0LObSw87Fq0dB+QFDKfaJpEztl/irNxPQ9FupEyCrwL7xRtT85HTfdYXS4j Y7nA== X-Gm-Message-State: AOAM5314VK/5rZqAxb/wgXd9ZHR6o937XxOy1WHtlhuSEQfqaq5FbnpR /p1bpcQOX3Gobaw0Zixh8GY85Q== X-Received: by 2002:aa7:8d0c:0:b029:3e0:2e32:3148 with SMTP id j12-20020aa78d0c0000b02903e02e323148mr25776486pfe.23.1629569272676; Sat, 21 Aug 2021 11:07:52 -0700 (PDT) Received: from ip-10-124-121-13.byted.org (ec2-54-241-92-238.us-west-1.compute.amazonaws.com. [54.241.92.238]) by smtp.gmail.com with ESMTPSA id n32sm11944585pgl.69.2021.08.21.11.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Aug 2021 11:07:52 -0700 (PDT) From: Jiang Wang To: bpf@vger.kernel.org Cc: cong.wang@bytedance.com, duanxiongchun@bytedance.com, xieyongji@bytedance.com, chaiwen.cc@bytedance.com, kuniyu@amazon.co.jp, Dmitry Osipenko , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Al Viro , Christian Brauner , Rao Shoaib , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2] af_unix: fix NULL pointer bug in unix_shutdown Date: Sat, 21 Aug 2021 18:07:36 +0000 Message-Id: <20210821180738.1151155-1-jiang.wang@bytedance.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 94531cfcbe79 ("af_unix: Add unix_stream_proto for sockmap") introduced a bug for af_unix SEQPACKET type. In unix_shutdown, the unhash function will call prot->unhash(), which is NULL for SEQPACKET. And kernel will panic. On ARM32, it will show following messages: (it likely affects x86 too). Fix the bug by checking the prot->unhash is NULL or not first. Kernel log: <--- cut here --- Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = 2fba1ffb *pgd=00000000 Internal error: Oops: 80000005 [#1] PREEMPT SMP THUMB2 Modules linked in: CPU: 1 PID: 1999 Comm: falkon Tainted: G W 5.14.0-rc5-01175-g94531cfcbe79-dirty #9240 Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) PC is at 0x0 LR is at unix_shutdown+0x81/0x1a8 pc : [<00000000>] lr : [] psr: 600f0013 sp : e45aff70 ip : e463a3c0 fp : beb54f04 r10: 00000125 r9 : e45ae000 r8 : c4a56664 r7 : 00000001 r6 : c4a56464 r5 : 00000001 r4 : c4a56400 r3 : 00000000 r2 : c5a6b180 r1 : 00000000 r0 : c4a56400 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 50c5387d Table: 05aa804a DAC: 00000051 Register r0 information: slab PING start c4a56400 pointer offset 0 Register r1 information: NULL pointer Register r2 information: slab task_struct start c5a6b180 pointer offset 0 Register r3 information: NULL pointer Register r4 information: slab PING start c4a56400 pointer offset 0 Register r5 information: non-paged memory Register r6 information: slab PING start c4a56400 pointer offset 100 Register r7 information: non-paged memory Register r8 information: slab PING start c4a56400 pointer offset 612 Register r9 information: non-slab/vmalloc memory Register r10 information: non-paged memory Register r11 information: non-paged memory Register r12 information: slab filp start e463a3c0 pointer offset 0 Process falkon (pid: 1999, stack limit = 0x9ec48895) Stack: (0xe45aff70 to 0xe45b0000) ff60: e45ae000 c5f26a00 00000000 00000125 ff80: c0100264 c07f7fa3 beb54f04 fffffff7 00000001 e6f3fc0e b5e5e9ec beb54ec4 ffa0: b5da0ccc c010024b b5e5e9ec beb54ec4 0000000f 00000000 00000000 beb54ebc ffc0: b5e5e9ec beb54ec4 b5da0ccc 00000125 beb54f58 00785238 beb5529c beb54f04 ffe0: b5da1e24 beb54eac b301385c b62b6ee8 600f0030 0000000f 00000000 00000000 [] (unix_shutdown) from [] (__sys_shutdown+0x2f/0x50) [] (__sys_shutdown) from [] (__sys_trace_return+0x1/0x16) Exception stack(0xe45affa8 to 0xe45afff0) Signed-off-by: Jiang Wang Reported-by: Dmitry Osipenko Tested-by: Dmitry Osipenko --- v1 -> v2: check prot->unhash directly. net/unix/af_unix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 443c49081636..15c1e4e4012d 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2847,7 +2847,8 @@ static int unix_shutdown(struct socket *sock, int mode) int peer_mode = 0; const struct proto *prot = READ_ONCE(other->sk_prot); - prot->unhash(other); + if (prot->unhash) + prot->unhash(other); if (mode&RCV_SHUTDOWN) peer_mode |= SEND_SHUTDOWN; if (mode&SEND_SHUTDOWN) -- 2.20.1