From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4772CA9EC9 for ; Mon, 4 Nov 2019 22:14:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A985F20650 for ; Mon, 4 Nov 2019 22:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905641; bh=ITA9eyjmsNMdA9lMb0N9KIK3rZjZ5YpCHXQjnFcG/Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hUCweLvcIlMRmb/aqRjnaK6DJg6bqc2QC7rj2xPR04sXDWgn2GbTlE1VJ5DPkPTzp hcKQGWPdBqQdj+picrQPZd8M2UGe2tDxXY1ZBUzRTzVcIYLYutowGYYgWfOyRno9tH J1AKVStAaHsoDTXbb4KdMkRSk4r/TlI0RhTOhTBc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390261AbfKDWIh (ORCPT ); Mon, 4 Nov 2019 17:08:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:41462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389853AbfKDWId (ORCPT ); Mon, 4 Nov 2019 17:08:33 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (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 DD90820650; Mon, 4 Nov 2019 22:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905312; bh=ITA9eyjmsNMdA9lMb0N9KIK3rZjZ5YpCHXQjnFcG/Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lfh9zA/8Hk1o7w2i5COXLMZjgjP0YkIKOUPPo3Icdf/tQzBLuqv9fxTev/SmAWOSY cAL/FKfj1kvK1+rlnegj4kcO26m8KG7boYo+Ota9t/anjT6Y/jD2Z1XeMtcTRXWixE jdsFjyn0qS3zPe0lK9kGo93o539MKfEbCpYiSXtE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Markus Theil , Johannes Berg Subject: [PATCH 5.3 103/163] nl80211: fix validation of mesh path nexthop Date: Mon, 4 Nov 2019 22:44:53 +0100 Message-Id: <20191104212147.527158596@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212140.046021995@linuxfoundation.org> References: <20191104212140.046021995@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: Markus Theil commit 1fab1b89e2e8f01204a9c05a39fd0b6411a48593 upstream. Mesh path nexthop should be a ethernet address, but current validation checks against 4 byte integers. Cc: stable@vger.kernel.org Fixes: 2ec600d672e74 ("nl80211/cfg80211: support for mesh, sta dumping") Signed-off-by: Markus Theil Link: https://lore.kernel.org/r/20191029093003.10355-1-markus.theil@tu-ilmenau.de Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -377,7 +377,7 @@ const struct nla_policy nl80211_policy[N [NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ }, [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY, .len = IEEE80211_MAX_MESH_ID_LEN }, - [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 }, + [NL80211_ATTR_MPATH_NEXT_HOP] = NLA_POLICY_ETH_ADDR_COMPAT, [NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 }, [NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED },