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=unavailable 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 C0113C18E5A for ; Tue, 10 Mar 2020 13:36:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 909732468D for ; Tue, 10 Mar 2020 13:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583847386; bh=oKBiYwoPDh1EbtQU3J1/l+Dl4A914nTfJRjp2mZn0oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T5qOVzwxkUeG7JOIcOaunNrJkE91WHRxLoBitEEiEZPpWxlBMc7l4tH5/unDMEpa5 9huEESpq3CsPp99oItPVp2xwltgoNZnu9Veqspr6strWAjczNKy6051739/O7X/TtL Bv2TwY55DAFScv76W7VHXGAnxxAwEbyXgNw1NrAk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726946AbgCJMm7 (ORCPT ); Tue, 10 Mar 2020 08:42:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:43196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727456AbgCJMm6 (ORCPT ); Tue, 10 Mar 2020 08:42:58 -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 C99A224691; Tue, 10 Mar 2020 12:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844178; bh=oKBiYwoPDh1EbtQU3J1/l+Dl4A914nTfJRjp2mZn0oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLjyTZUdoE4IrUDbAyoJiH1h8IXXZSwygzGqvppWYcSravrpsusNlj53Ems/pMP/I YAm2iWytKTCdz12VptBRcmhPT2Bgwyxe8E8rVFgwb9pQR8VPHmAI7UbYoLOJ01UWS+ LirCFYedItDLlt/nTHPivaECWnPEvPI/nsQo+5Go= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jethro Beekman , "David S. Miller" Subject: [PATCH 4.4 12/72] net: fib_rules: Correctly set table field when table number exceeds 8 bits Date: Tue, 10 Mar 2020 13:38:25 +0100 Message-Id: <20200310123604.656709747@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123601.053680753@linuxfoundation.org> References: <20200310123601.053680753@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jethro Beekman [ Upstream commit 540e585a79e9d643ede077b73bcc7aa2d7b4d919 ] In 709772e6e06564ed94ba740de70185ac3d792773, RT_TABLE_COMPAT was added to allow legacy software to deal with routing table numbers >= 256, but the same change to FIB rule queries was overlooked. Signed-off-by: Jethro Beekman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/fib_rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -570,7 +570,7 @@ static int fib_nl_fill_rule(struct sk_bu frh = nlmsg_data(nlh); frh->family = ops->family; - frh->table = rule->table; + frh->table = rule->table < 256 ? rule->table : RT_TABLE_COMPAT; if (nla_put_u32(skb, FRA_TABLE, rule->table)) goto nla_put_failure; if (nla_put_u32(skb, FRA_SUPPRESS_PREFIXLEN, rule->suppress_prefixlen))