Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2693028ybg; Mon, 28 Oct 2019 00:21:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNEbFGrUrCIpdRyP6ntAdHGrElV9MS2p50agSZyNgBEehAAzHPtvpmaeMVSEmxUnvt022U X-Received: by 2002:a05:6402:304e:: with SMTP id bu14mr14906837edb.89.1572247296840; Mon, 28 Oct 2019 00:21:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572247296; cv=none; d=google.com; s=arc-20160816; b=Yp7jp2sCPk2PezsIsXoQi8b3W3T+DpkRFH+qmU/E2ZQFtSZ0qGREGVru2/T87DgdKa U3IBWOgBNawIK8g4x2h30fzCEyycEhmMy7q6nPMRZXW0afsuDeg3XNQdH7N2xS/XtFiV lqB+wWg+evSFM6OjiAJ6U3AvBrDsVkDneMs8FPVaoso7M/DN2P8Py6vzXuKuDpBu65X7 Nzw+xGUKLNAeAozO04Tut5/3/m/ACp6xvNdjaRIs3zOGTxsJSjgD/VAgML98T3nE+yT7 qd3vcGgDsBVGdRPO5EqoQCYv+B+LU8LW9XmmyFQOh99GkJoLypn3JSrW5+JGSkPDrBkO gsQw== 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=RZ/Y8oXmSJuZgYNUktWRkTPQDVdGYb7rdpnRV1CoD6Y=; b=oXiHoHD4thVRi1fV3cwSwiKEwjpsHza3KX1AxZqCoX1I1e0WNxElx9OsHH3zrKK+7h 4DEQCUvzX8gdvz/mxoYMyeNF2JsZzUC+ZPZlKoJsH8GNq1LPjjmjF9bXftiXjmXVw73f nokvESHPjBhy8EUuFH2xZiiYdY8R6vRJr9eP5fjuAve9Li9t2UrlujqxSsXhT291u8o7 ay58lN3luS5lcn2uL6/DgCxqYG4WtVAsQMvuPpDQagGxCl/mJ7sZEvlyxHhsddzokHEO RaoBiZAuN/gLK5qhcYN/Ue+6JY3lcmQke8hxFNuaRyJhE8U+LLXgfIA4UllcexkIZEq8 2WCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TY8MayrT; 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 e48si6715866edb.370.2019.10.28.00.21.13; Mon, 28 Oct 2019 00:21:36 -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=TY8MayrT; 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 S1731289AbfJ0VS2 (ORCPT + 99 others); Sun, 27 Oct 2019 17:18:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:38586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729984AbfJ0VS1 (ORCPT ); Sun, 27 Oct 2019 17:18:27 -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 BCA92205C9; Sun, 27 Oct 2019 21:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211106; bh=R/w1Klkh0QclIluf+LWpLEXbuhm2KYdmkpHGPzrey6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TY8MayrTRYNqdmREvZMOtofo9CVaupFd1QnSdNASDNaYAlwiDCg7tjn+J94237EnP 7rFlsUDJp9jkDdhGyEcZxWykN2H3q4aEDDJlIoSmuaHfe8Q2c0Kp/vb0yPVtwCqgRh MQ3f4MNaIpMRZDUtLXu/XQeWoFLIn/EXSuOqum9w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaoqing Pan , Johannes Berg , Sasha Levin Subject: [PATCH 5.3 033/197] nl80211: fix null pointer dereference Date: Sun, 27 Oct 2019 21:59:11 +0100 Message-Id: <20191027203353.522538964@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: Miaoqing Pan [ Upstream commit b501426cf86e70649c983c52f4c823b3c40d72a3 ] If the interface is not in MESH mode, the command 'iw wlanx mpath del' will cause kernel panic. The root cause is null pointer access in mpp_flush_by_proxy(), as the pointer 'sdata->u.mesh.mpp_paths' is NULL for non MESH interface. Unable to handle kernel NULL pointer dereference at virtual address 00000068 [...] PC is at _raw_spin_lock_bh+0x20/0x5c LR is at mesh_path_del+0x1c/0x17c [mac80211] [...] Process iw (pid: 4537, stack limit = 0xd83e0238) [...] [] (_raw_spin_lock_bh) from [] (mesh_path_del+0x1c/0x17c [mac80211]) [] (mesh_path_del [mac80211]) from [] (extack_doit+0x20/0x68 [compat]) [] (extack_doit [compat]) from [] (genl_rcv_msg+0x274/0x30c) [] (genl_rcv_msg) from [] (netlink_rcv_skb+0x58/0xac) [] (netlink_rcv_skb) from [] (genl_rcv+0x20/0x34) [] (genl_rcv) from [] (netlink_unicast+0x11c/0x204) [] (netlink_unicast) from [] (netlink_sendmsg+0x30c/0x370) [] (netlink_sendmsg) from [] (sock_sendmsg+0x70/0x84) [] (sock_sendmsg) from [] (___sys_sendmsg.part.3+0x188/0x228) [] (___sys_sendmsg.part.3) from [] (__sys_sendmsg+0x4c/0x70) [] (__sys_sendmsg) from [] (ret_fast_syscall+0x0/0x44) Code: e2822c02 e2822001 e5832004 f590f000 (e1902f9f) ---[ end trace bbd717600f8f884d ]--- Signed-off-by: Miaoqing Pan Link: https://lore.kernel.org/r/1569485810-761-1-git-send-email-miaoqing@codeaurora.org [trim useless data from commit message] Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index f03459ddc840a..c2ce582ea1437 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6184,6 +6184,9 @@ static int nl80211_del_mpath(struct sk_buff *skb, struct genl_info *info) if (!rdev->ops->del_mpath) return -EOPNOTSUPP; + if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) + return -EOPNOTSUPP; + return rdev_del_mpath(rdev, dev, dst); } -- 2.20.1