Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752929AbdDJQLA (ORCPT ); Mon, 10 Apr 2017 12:11:00 -0400 Received: from mx2.suse.de ([195.135.220.15]:37800 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754181AbdDJPeF (ORCPT ); Mon, 10 Apr 2017 11:34:05 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Matthias Schiffer , "David S . Miller" , Jiri Slaby Subject: [PATCH 3.12 025/142] vxlan: correctly validate VXLAN ID against VXLAN_N_VID Date: Mon, 10 Apr 2017 17:31:46 +0200 Message-Id: <279ce17d666d23cdf5e95efb0ccbe23ab2bfb94f.1491838390.git.jslaby@suse.cz> X-Mailer: git-send-email 2.12.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1048 Lines: 35 From: Matthias Schiffer 3.12-stable review patch. If anyone has any objections, please let me know. =============== [ Upstream commit 4e37d6911f36545b286d15073f6f2222f840e81c ] The incorrect check caused an off-by-one error: the maximum VID 0xffffff was unusable. Fixes: d342894c5d2f ("vxlan: virtual extensible lan") Signed-off-by: Matthias Schiffer Acked-by: Jiri Benc Signed-off-by: David S. Miller Signed-off-by: Jiri Slaby --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 73790abf0c2a..47cb0d06c165 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2243,7 +2243,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[]) if (data[IFLA_VXLAN_ID]) { __u32 id = nla_get_u32(data[IFLA_VXLAN_ID]); - if (id >= VXLAN_VID_MASK) + if (id >= VXLAN_N_VID) return -ERANGE; } -- 2.12.2