Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2251349ybg; Sun, 27 Oct 2019 14:24:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXLAnsFCSEcYAlgCL70C5TC6hN0uzeA3zcKBabE0awrmcBcyB7nn7rYyneCmWwHut2BPli X-Received: by 2002:a17:906:3ecc:: with SMTP id d12mr13711946ejj.52.1572211468980; Sun, 27 Oct 2019 14:24:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211468; cv=none; d=google.com; s=arc-20160816; b=VFsndvFOnEkaoA+A4pWBCw1xktDj1eou802jsBMAGmzI5cEGdT1U0KvFA7i95XGQ8q REL+MvfU3Ujf1VlmtvPb85JSqrp2rfJY3xhdJuzMgfNLW8uLBAnEfWvgNlIdl9KY5RJu paDJlWxYM3AMji5oQt7gFZyvyUVvHO4U5ZUSnBkm/MmsI75mz4UsID+bkNUo6mQY64wd D5V8o5ADoTku97RQVnUhXSMvdpWj/HZnLK7HuBB0QW71TdGajLH2hLPB3q4nJU4FcCtx JkIwgwJkHo8CwgK6e1D75eiYp7KaadtriGp1qN0k+NhClW1NlE4Lb6+uegiwsS+VslKq AlLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Y98ssH/lxij3ppCCEKvVoXoZBQ5uACFJV1tlr2++8dM=; b=BK04HEEgxfMw+GL8moy/PxOAN+haB/OpXeQEMJqLJj6HUJ5T/Aj3Q+rSOCjkdqQiTV G0mlj0dAmnHU8gPepsosuZIDULGCCl7lwGv2Ko/KV19JwbGdGv9xW8i50ZrYMB8Yoi/R ylcNTHh9UBu/LYLjOfmGaujf0vXaRXaU0XJamAIm0ljE3JdAUO3bhdNQhZ/YMDwUyddn 6wzqthmGA20ot5pwJ/pRhT6N3+czfQUNXbDSl3RXIfiH9171Zj2Y8BNq2hK4KG/McAfh jdN01a2PFN1v0E/onv5yCVlv45syX4qs4JxnlQJBjxxC36tGkbN32Pw1pJU5FTNJ2ZQy DiSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1PBmd/nR"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t15si3803401edt.264.2019.10.27.14.24.05; Sun, 27 Oct 2019 14:24:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1PBmd/nR"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731750AbfJ0VUj (ORCPT + 99 others); Sun, 27 Oct 2019 17:20:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:41220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730775AbfJ0VUh (ORCPT ); Sun, 27 Oct 2019 17:20:37 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71D94205C9; Sun, 27 Oct 2019 21:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211237; bh=FRcip+bf8Avo8hiV0AGljEttBNu7felxz/jLbrHDQbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1PBmd/nRqP5OdNj7//+HgdRiqkFJVvUlY+s3souE0hhWXxkp5CXoXzuhXtTvvQp4A dzi8QtYkbKbR5K/RMqhiEnnzgkGkCrGun3q88RxaZ3bO9R+JO4alUCoV4BHZxt756w /JsoY5XWVCw9xGS24sGc4gjgjTbF2UAmPKzeU2LU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+611164843bd48cc2190c@syzkaller.appspotmail.com, David Howells , "David S. Miller" Subject: [PATCH 5.3 078/197] rxrpc: Fix possible NULL pointer access in ICMP handling Date: Sun, 27 Oct 2019 21:59:56 +0100 Message-Id: <20191027203355.887466873@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells [ Upstream commit f0308fb0708078d6c1d8a4d533941a7a191af634 ] If an ICMP packet comes in on the UDP socket backing an AF_RXRPC socket as the UDP socket is being shut down, rxrpc_error_report() may get called to deal with it after sk_user_data on the UDP socket has been cleared, leading to a NULL pointer access when this local endpoint record gets accessed. Fix this by just returning immediately if sk_user_data was NULL. The oops looks like the following: #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page ... RIP: 0010:rxrpc_error_report+0x1bd/0x6a9 ... Call Trace: ? sock_queue_err_skb+0xbd/0xde ? __udp4_lib_err+0x313/0x34d __udp4_lib_err+0x313/0x34d icmp_unreach+0x1ee/0x207 icmp_rcv+0x25b/0x28f ip_protocol_deliver_rcu+0x95/0x10e ip_local_deliver+0xe9/0x148 __netif_receive_skb_one_core+0x52/0x6e process_backlog+0xdc/0x177 net_rx_action+0xf9/0x270 __do_softirq+0x1b6/0x39a ? smpboot_register_percpu_thread+0xce/0xce run_ksoftirqd+0x1d/0x42 smpboot_thread_fn+0x19e/0x1b3 kthread+0xf1/0xf6 ? kthread_delayed_work_timer_fn+0x83/0x83 ret_from_fork+0x24/0x30 Fixes: 17926a79320a ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both") Reported-by: syzbot+611164843bd48cc2190c@syzkaller.appspotmail.com Signed-off-by: David Howells Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/rxrpc/peer_event.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/rxrpc/peer_event.c +++ b/net/rxrpc/peer_event.c @@ -151,6 +151,9 @@ void rxrpc_error_report(struct sock *sk) struct rxrpc_peer *peer; struct sk_buff *skb; + if (unlikely(!local)) + return; + _enter("%p{%d}", sk, local->debug_id); /* Clear the outstanding error value on the socket so that it doesn't