Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4478520ybz; Tue, 28 Apr 2020 12:00:19 -0700 (PDT) X-Google-Smtp-Source: APiQypIpQhSY9qNs51KtAKNRwSCpBrW24bsv9pszIC5FURWORLwo2v4phQGrtkKCdqPq3lFDmDKm X-Received: by 2002:a17:906:bcec:: with SMTP id op12mr26291723ejb.245.1588100419576; Tue, 28 Apr 2020 12:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588100419; cv=none; d=google.com; s=arc-20160816; b=xgnRq8FDlPZO0vAXIvvljSgKpI/jzTPlk4AQwCWFPUfwqNV6bw6VwQuLF43yhw2Ns2 8Neom9TojPp7w2mjCzRea1+2zNwcFZyh0t6KfzUzQ3/+sUA/Tgcc9qmDj4YRKJrs3Cwg 7dxS1bCi8pVsFUHx4Ti9rnw7KW0esSdtctyI8ivYZ1Ihk6AYGUGAeSkL+DfGV8o+eNmV iznzfiE59ZKA7CM8bJp7he88y0etGNla7K35UmxhAVjpH2mJ+fJv2/ALktxJm5QOyKN9 vgQsppWHDm7ycdASnb/JZt9qrj3ebWI4S8hOXMg6hYzMHKUHseF4hoe5BpaOrQVeM3Xu 4Nng== 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=6/8hdNDdXziwPp5Cid1DGyGpG08gB1+uMkZQGv1Nc/Y=; b=iz7q5PLgli+QO+KgOhha8YBIcEj3tL00F+Z/AaDbsmkV5Y40lxOhanZEW6whawGEdK OL32NtmnDuANIkZEZ8iDT5IJEgf9jDxlaJ/lZxEIOfU9T7v/GNYSPnY8kFmhqclwRCR3 OD3xqUetX5PZLyMGyTJqBSncxWUZlPO++P8CmfE24h8qpj6IVCj24yw5/uxtKLOcnuKT Q2iD3fDhYRM7dBtnURpC3jhsh85X1KvsXLkL8oRxw34Jxw2OrlvODdvPv129SznuwJ0G 7GjTDPoudSh4FNtMzA+4MxmDy8AKmzLYbtpjPIXrtbJDUGYjMrFOUyw5Wfh7zwX1tfNT QmRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fkM9LzlI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g8si2611970ejb.359.2020.04.28.11.59.54; Tue, 28 Apr 2020 12:00:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fkM9LzlI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729657AbgD1S6j (ORCPT + 99 others); Tue, 28 Apr 2020 14:58:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728768AbgD1S3G (ORCPT ); Tue, 28 Apr 2020 14:29:06 -0400 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 AC1FB208E0; Tue, 28 Apr 2020 18:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098546; bh=C4T+9qNnW8xUkfV4aUIrKOLkJ/rwfdF2rXxGPscAWbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fkM9LzlIttUCCytXvHUaFMzq73uxN8OqrWuKewza2eBVcykTkwQSVcQJihb7vHqQ1 s6iPT5VuSRfSXmEyZOlsddAA0BC11Vh1Ni3sB/H7uNv3iPXro/NWbw1SlMjIWjwKcR qaL7GhDLDW2iTKP1TGogzH2Dzqv7JSbvj+rqRuas= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sabrina Dubroca , "David S. Miller" Subject: [PATCH 5.6 070/167] vxlan: use the correct nlattr array in NL_SET_ERR_MSG_ATTR Date: Tue, 28 Apr 2020 20:24:06 +0200 Message-Id: <20200428182233.814364231@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182225.451225420@linuxfoundation.org> References: <20200428182225.451225420@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: Sabrina Dubroca [ Upstream commit cc8e7c69db4dcc565ed3020f97ddd6debab6cbe8 ] IFLA_VXLAN_* attributes are in the data array, which is correctly used when fetching the value, but not when setting the extended ack. Because IFLA_VXLAN_MAX < IFLA_MAX, we avoid out of bounds array accesses, but we don't provide a pointer to the invalid attribute to userspace. Fixes: 653ef6a3e4af ("vxlan: change vxlan_[config_]validate() to use netlink_ext_ack for error reporting") Fixes: b4d3069783bc ("vxlan: Allow configuration of DF behaviour") Signed-off-by: Sabrina Dubroca Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/vxlan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -3144,7 +3144,7 @@ static int vxlan_validate(struct nlattr u32 id = nla_get_u32(data[IFLA_VXLAN_ID]); if (id >= VXLAN_N_VID) { - NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_ID], + NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VXLAN_ID], "VXLAN ID must be lower than 16777216"); return -ERANGE; } @@ -3155,7 +3155,7 @@ static int vxlan_validate(struct nlattr = nla_data(data[IFLA_VXLAN_PORT_RANGE]); if (ntohs(p->high) < ntohs(p->low)) { - NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_PORT_RANGE], + NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VXLAN_PORT_RANGE], "Invalid source port range"); return -EINVAL; } @@ -3165,7 +3165,7 @@ static int vxlan_validate(struct nlattr enum ifla_vxlan_df df = nla_get_u8(data[IFLA_VXLAN_DF]); if (df < 0 || df > VXLAN_DF_MAX) { - NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_DF], + NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VXLAN_DF], "Invalid DF attribute"); return -EINVAL; }