Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8560950ybl; Thu, 16 Jan 2020 19:37:40 -0800 (PST) X-Google-Smtp-Source: APXvYqwQOI9EOpwddpoXrKb8rIP+MjPFxYD2hlB4Nlk26ocws4CvavD5CNnFgmUUQHvnNES7ZK78 X-Received: by 2002:aca:bbc6:: with SMTP id l189mr1974574oif.53.1579232260148; Thu, 16 Jan 2020 19:37:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579232260; cv=none; d=google.com; s=arc-20160816; b=TqbGUtZdMA7qwcILlMA/sSqhJ4muV/It6GRMDRu2dT3qHhymMxuVZ+YE4niCyoKxs0 cE+DXP12blgqux8aJ7uUzSpUGKizbwaLuIfBWD9GAt0EdJuaHqWpCHkiUSlbV6xvb/7F Lce9mZ7Q5bw4CRnAC50VBEDWP6ydaF0Pu2C49AErth3cRRpapNDH+0Y6VQoHUhHHq5eN H08TiYBIGQ8YUXHqkdAR1OCpTVFX8oyDG6TbArDhn9OgLL0gZV2paqvEPtItnc/vPMlY Cy4ValzsgU1tfzZrMChwcKPL12vTTDOetTALOK2qrcd2RgIb5iY2aSWxsCnTgMkOLJGR TT8w== 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=reYdfZEF43tBGQxegocq+XkzjkWA7CElvRIas0FtMlU=; b=OF1S+y+l8lH+eXgJE2HIUkAw/+9C1sIL85i2KIv0+m70ZkdJ6waxm8fv3vwfVJ+JpO DX9S2BVkCS1TR9han4jCtisI3wX6x2Fbh9UXXIICT7czgKbGGvldEdFrV+d6GRWmMQKW gfXoddquj1Yl61J/wgLxhK15D1ux8c/1nkPpy+y/bCmGvcdUmlOHiZk7RRfNn+BzUkCb hB/ehu2LP1EDRwxD7Y1tOO8iK6wsjPT0FI6wdeWOSKYyKW8A4S7QchsveHAPVJwe/rr5 KMZcsKq8RX2rUjIpQqGzPNbmFZCE5mW6gEd79rGp//e+sFWkayLd+oUx+O3C3rtTgK+5 CLMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PHYzm8UN; 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 v14si14000310oto.127.2020.01.16.19.37.28; Thu, 16 Jan 2020 19:37:40 -0800 (PST) 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=PHYzm8UN; 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 S2391986AbgAPXqO (ORCPT + 99 others); Thu, 16 Jan 2020 18:46:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:49974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390905AbgAPXWN (ORCPT ); Thu, 16 Jan 2020 18:22:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 11D3C2073A; Thu, 16 Jan 2020 23:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579216932; bh=tSTT7czsVqE67MSHd+OyLSOcwk2po/pfGgxNVwE0rG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PHYzm8UNtl16EINndx6QYrZms6VX6R1sCpJgbhRPUiCT7q2KFzMECmlVQ59JaQD2e PN48xhELSsBDgBVvFF0z/cPYohnA9aQcQItCqcsQ5favOj5jA8EGZfi0ONe9aIHyqM +R84ruSgTs2EcN2WythxYxMjKibIEPdDAYqdOTwc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , John Fastabend , "David S. Miller" Subject: [PATCH 5.4 079/203] bpf: skmsg, fix potential psock NULL pointer dereference Date: Fri, 17 Jan 2020 00:16:36 +0100 Message-Id: <20200116231751.508994827@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231745.218684830@linuxfoundation.org> References: <20200116231745.218684830@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: John Fastabend commit 8163999db445021f2651a8a47b5632483e8722ea upstream. Report from Dan Carpenter, net/core/skmsg.c:792 sk_psock_write_space() error: we previously assumed 'psock' could be null (see line 790) net/core/skmsg.c 789 psock = sk_psock(sk); 790 if (likely(psock && sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))) Check for NULL 791 schedule_work(&psock->work); 792 write_space = psock->saved_write_space; ^^^^^^^^^^^^^^^^^^^^^^^^ 793 rcu_read_unlock(); 794 write_space(sk); Ensure psock dereference on line 792 only occurs if psock is not null. Reported-by: Dan Carpenter Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: John Fastabend Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/skmsg.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -793,15 +793,18 @@ static void sk_psock_strp_data_ready(str static void sk_psock_write_space(struct sock *sk) { struct sk_psock *psock; - void (*write_space)(struct sock *sk); + void (*write_space)(struct sock *sk) = NULL; rcu_read_lock(); psock = sk_psock(sk); - if (likely(psock && sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))) - schedule_work(&psock->work); - write_space = psock->saved_write_space; + if (likely(psock)) { + if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) + schedule_work(&psock->work); + write_space = psock->saved_write_space; + } rcu_read_unlock(); - write_space(sk); + if (write_space) + write_space(sk); } int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)