Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2919576ybg; Mon, 28 Oct 2019 04:39:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwz4fTWDq1s5zU6hxbOi9qsMoPUqap/mELG5vw/JA8Klmg8UO4LuQDFL4SHvnZgrqWW1aDo X-Received: by 2002:a17:906:85da:: with SMTP id i26mr4987686ejy.186.1572262753935; Mon, 28 Oct 2019 04:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572262753; cv=none; d=google.com; s=arc-20160816; b=Eyk9pIRxLSvEgT9Zs1E5//ogZez8mAbgkRReP/nmo1cS+Fp/U+njH7VdiCEXQrbDr3 dcGKXuDPtp5YBrKqokcOiRIsYRm8rFvAsX/JK+PMOESlJ7Lg8EfODrtKlxLcly1eIIQe nsu5ZMvGEuUmVNPGLpfOl/SVg8lSuaVyIwCVkQPLbImdmIOTBoehMIg8/jBNE+EzPdEz SHM/L1fCj4V1Ji8CXd/rd3AJ95lboCAc1uNvs7ZgJgygN5yqwoksWVheubW8JgFpYOGM CoYVGMf6PA5Px7lKVqIPF98b056w8Gq8IUdFALQjwfNnDyf0HQ56j5l8p6eGt+P2pbVp OWQg== 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=0H/O0RDU2y3RGm36nAsAb+C+PhWt+lOG4mqa611JtDo=; b=KMkkN4MNiu6V0+kwDWRUYnCDzkc2lvJT1NXTthq9ZJqvlPFm7hI6qXGPr8KhWh3euU q9HK3FnTEdPaUy63bv1g/Vqw6jPyoGRt/XCTDNCx1aLTRejcTO2D89BP6Gu/w3isNmvE CuyyffywurpCkZhCC2MNEQNoAmEZ2D81bxk+UrQMtXGvyPnDF6qD1LFGrylKQy0m8+i9 V+KP45LbK7GtbGkuVYBa2QSaUGHLzi86F68Q+vu9ZBHpzoodEhnhhz/Kal7pm/sZtY08 No6KqFaLUdXDGlbjBGhXOqlB/ypS/sgdHIe37yh4iDoIY6oXLv2RkS+E00c8s9f+IWSr 5DSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kbhq1dNJ; 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 u10si6134057ejt.282.2019.10.28.04.38.47; Mon, 28 Oct 2019 04:39:13 -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=Kbhq1dNJ; 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 S1727915AbfJ0VhB (ORCPT + 99 others); Sun, 27 Oct 2019 17:37:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:51784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727917AbfJ0VFz (ORCPT ); Sun, 27 Oct 2019 17:05:55 -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 546C620873; Sun, 27 Oct 2019 21:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210354; bh=z4INOP111tBsJ/9QuYmz9FD3MZuDnAxeQBSL5+DcvPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kbhq1dNJ+qAqIrCPfm+ZpKC6m53pf+22j3i5/a8JfTqZKY3wE28Vaw4/ZmrCX9sQh bLdILsO5MWxtXQ6NOVbpsCAcSoYDSnC13AMnOi9hz+avcJWRjeImZ8L+0SH/kqgnxg KAOIUtsYFC3lKRhD8GzKetFP7vBr1QER80lwGUjE= 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 4.9 07/49] nl80211: fix null pointer dereference Date: Sun, 27 Oct 2019 22:00:45 +0100 Message-Id: <20191027203123.899927239@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@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 7aa1ca7ec638a..ac75e6d4eb82a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5358,6 +5358,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