Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4462576ybz; Tue, 28 Apr 2020 11:42:27 -0700 (PDT) X-Google-Smtp-Source: APiQypJ1You93PmgSzlCUv1R/VgezpqQm5XFRvz8jPtCAC+If9Kgew9769gOknN1h9MNtWm9+AeR X-Received: by 2002:a17:906:e90:: with SMTP id p16mr26352228ejf.14.1588099347000; Tue, 28 Apr 2020 11:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099346; cv=none; d=google.com; s=arc-20160816; b=JNKAnliJfKWJ42n1wHzN/l61ACnCNdWrENmalJCbPHXzL3a6wDeVONaQFBcTP1uSDt qaM0C0BK9SYyyjYVGLnpkmJyGKAU1xHAckR3T6vbDcpoqJKSFurCDdma6Q+QNg3kLy/j J42LdC4m2Kb9Gcib/XbvobVzqUAUPi4DtZawM/qJDdjDVqmna7+2YroNLXmoZPulnHGe kosVO7liLrZEL5thht90UPQk81E3aKsBWTlpqEPWBFlEx3pzfHrREwVlPjm93jCLz5hO nwNBTc4TJ34R5PNxNNJgcoT9yvGBCz3Z2a2rYSCXdX4mMp9acFn5FiEJJMrscNFT6UPl H1dQ== 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=XPuCyDnG9YDkLuAdlj6CHoxZhp6w7m4LXgUK4hCKT8Ec22+QC85MN6RbIl3ejsBnHb FHpIZKHpqjeIYFzTz80yLPAqJ9hH9/YSdu3RIqiIM4h0Ue33b842Jq3RmD7K/Xkqr5fq WX1Tds1e74k5gXcEL3L0jqlT9/oxQKbaf1FOctedu50zUgmD3ItCtRiu3aEegeHNt9jj aUXnI+x7iKy0zdbm31UXSVU22SF0HYsfTO9D2EjihOvNgK2pivmdy4xxJxv17QVuHPln E8oMOkmob89zHCJbKkbwEjj4EgyXvONMMlJMlACai5R5wrQWrMEaU1SyMzv1reTGf4wM JJ8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DtHS7idh; 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 q24si2310741ejz.458.2020.04.28.11.42.03; Tue, 28 Apr 2020 11:42:26 -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=DtHS7idh; 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 S1730789AbgD1Sko (ORCPT + 99 others); Tue, 28 Apr 2020 14:40:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:59854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730953AbgD1Skk (ORCPT ); Tue, 28 Apr 2020 14:40:40 -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 F39B720575; Tue, 28 Apr 2020 18:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099239; bh=C4T+9qNnW8xUkfV4aUIrKOLkJ/rwfdF2rXxGPscAWbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DtHS7idhUpg+ypLWABEoh0jBfs3YPyqnsnFJ5TV7Klbm9tPHKRthWjOMY1+2p7h6m jx1gcktWGgYgNkaSrRnzymTb8sEarOYk6TMlZsvKWOCxCv+dLUXpQsPprl5d3NpB2q 1/fkrLdtI8zYe3bLWgs9xLTy/3eKE9UigXTWKpSk= 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.4 079/168] vxlan: use the correct nlattr array in NL_SET_ERR_MSG_ATTR Date: Tue, 28 Apr 2020 20:24:13 +0200 Message-Id: <20200428182242.170282676@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@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; }