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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 18482C43381 for ; Fri, 1 Mar 2019 13:38:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDBA82084D for ; Fri, 1 Mar 2019 13:38:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="dB7LsZYT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387854AbfCANis (ORCPT ); Fri, 1 Mar 2019 08:38:48 -0500 Received: from mail-eopbgr130084.outbound.protection.outlook.com ([40.107.13.84]:64160 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387601AbfCANis (ORCPT ); Fri, 1 Mar 2019 08:38:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rGfwUmjB+plR1QhckQXF+M/Vb4zkjXI8qU3PgKwAG3Q=; b=dB7LsZYTsLS5t5s2+okOn8pUOGVKrpswAZbB46Pk6ErAEzBNOGuk1hP+HS3OUq24H7gziZ+K2YRtMKueHbrk+u6DPiHnAAhp4UuM1w9zVuCVOZrY1vGQGF3MUyce5N1GoS2CqoCHcstieLHKzOsLii6YFxCZN4Vcxzbo1iz6V40= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB5380.eurprd05.prod.outlook.com (20.177.117.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.15; Fri, 1 Mar 2019 13:38:43 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::458c:8deb:ca54:1327]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::458c:8deb:ca54:1327%2]) with mapi id 15.20.1665.017; Fri, 1 Mar 2019 13:38:43 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , "dsahern@gmail.com" , mlxsw , Ido Schimmel , wenxu Subject: [PATCH net-next] net: ipv4: Fix NULL pointer dereference in route lookup Thread-Topic: [PATCH net-next] net: ipv4: Fix NULL pointer dereference in route lookup Thread-Index: AQHU0DQWnE5+Lj3RKkuXdCjoy0tkHA== Date: Fri, 1 Mar 2019 13:38:43 +0000 Message-ID: <20190301133810.8107-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0102CA0027.eurprd01.prod.exchangelabs.com (2603:10a6:206::40) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.176.7.115] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3cdb034d-c301-451d-b84a-08d69e4b38bb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB5380; x-ms-traffictypediagnostic: AM6PR05MB5380: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB5380;23:vUeGWtuMAWbAItHbTAu/OKJIdHw1lge2V8uHm+S?= =?iso-8859-1?Q?9CVCIlqEA8565W185h/TKvHt3NlwhPhzE/YBjNVD661MJuMiG8usgdX4K5?= =?iso-8859-1?Q?tvBzOWZ2HTrJVAQA/Jtce465mQmW9uval+MOSM06muq97AAOP7oGpfzWZ4?= =?iso-8859-1?Q?ilym8VsGynhM++b8Z8OUkuRztcIhyrN7N3dKgPyvYUJ81KtqsvA3q5UcSs?= =?iso-8859-1?Q?dyURJDNR6nuG513YWGHZV6p9TPlrcq+rRqKTtx4yLH9AMx4ctgwVEEv364?= =?iso-8859-1?Q?F4vkkID+qFETYktcn5l8y955l5jW449Lqbx5rIrs4iUkwGNDEcx45V0ANQ?= =?iso-8859-1?Q?QSGHQc3rjqe5uTsU+6l2O+ptsmmYjeqdivGXdZve8c8Vy6GfwAVZ9HLHIT?= =?iso-8859-1?Q?PF75t5HqFod+zTiEjy/YHqNUpe+omVs9vqW+k4UkpQSZyeqoJy1Scg6cLT?= =?iso-8859-1?Q?+bjvKs3V490BB5qjIShVTgxhHijTtghgqhT0qL1kSA8mHq4fAyPKQVa2pW?= =?iso-8859-1?Q?Sw016eJyuw7cn+ONkdunAgvNfnP0UCE543q26/SEhqnWh14aWSVjS9A7y8?= =?iso-8859-1?Q?Fspg35zjA8/gLeOslO7sPvoIWX5gVSvA2YSop4/QDxABgRs5VH6aptLncF?= =?iso-8859-1?Q?DKtQDet0z/kmbTVlritl+5QgPNy2WFszyDLHtXQP0Nmbi2rVyUkhgh0YqK?= =?iso-8859-1?Q?ijzOBuwQ71WbJJlXTcUHW69f7xhq6mhoA63zwic2qBnXfotZMd/VLPD7NM?= =?iso-8859-1?Q?rYtuHlHIvJ9jMomB+kY031W+4QcNPvoWqv1GD+tVqzRRTHTnxYdbfYcBrf?= =?iso-8859-1?Q?JnlixEwOkYSlvtzGDyttw+VsHso+mIO1s8Pi49qyP7I/PkTafg8dyNSJtz?= =?iso-8859-1?Q?EQqV/uk9oc+c1EzPSZ42rMK/BSwEhE+V2SisbWnV7qcLmg50IuBZn1sb1v?= =?iso-8859-1?Q?N3k61y97PsXwUQVR49xjIonqYnMwdJuGrtMPHivvVTctIQl0yNNWUjNHYy?= =?iso-8859-1?Q?dKJ3s42doxQ4ZW8B7myqmYgzxjV4JEvPdWgxZZ8ar2iCiy77xg7G6slVq1?= =?iso-8859-1?Q?OX0fzLrBe3vMyggYyQEFjycqMLj2hhKHk0mJeXNdikGSxfURmaqhYSaa1K?= =?iso-8859-1?Q?WG/+tL5Jnh0WBQejDNE2A6B4ZwsHQU+YwpUU82GWBNJuLx9Gy3wffHG/nz?= =?iso-8859-1?Q?eUKKpULf1Xn/7HtAcW0p4mR0ua+cIzj3F4qUkblUZuJGjfEVVgIoJjlyph?= =?iso-8859-1?Q?T1h/a72+ocrBlaABXBuh5YKW98/a4Af08hoVvqpSWcS+TDmFsMKiCXr3e2?= =?iso-8859-1?Q?qTrhMT3ZlGe6L6wZkea1hs6?= x-microsoft-antispam-prvs: x-forefront-prvs: 09634B1196 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(136003)(39860400002)(376002)(346002)(189003)(199004)(486006)(476003)(97736004)(1076003)(53936002)(14454004)(186003)(5660300002)(14444005)(4744005)(71190400001)(6916009)(478600001)(2351001)(66066001)(105586002)(256004)(6512007)(71200400001)(102836004)(6486002)(106356001)(2616005)(68736007)(6506007)(50226002)(6436002)(26005)(5640700003)(81166006)(305945005)(4326008)(99286004)(8936002)(1730700003)(8676002)(86362001)(2906002)(3846002)(6116002)(2501003)(52116002)(36756003)(25786009)(316002)(386003)(54906003)(81156014)(7736002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5380;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6nkk1nPhfPo+dnMDZZjg4qRH7zyd2jjGEUthHWOPvtMXMOUZCKET5alf8ORWXbKC9eE0o+MmDyZ9WpreNTHLp4Xy9810cRYlw9TCABaRTikcPF6jCTfZL9AYamgNGutokSHiPzodsSyx1GwNE5szWnrltvbT5yvQ6gVwpG4XN7AZ8SYm6hlOYCw4T0Jb9adhhe4N9KyjdS2RHPRnZoLwdti6IQogRD6sB787KnPYRG5O6k6fM1Buqhh0hMQbBgSWqASa2LS2KxKIBd0HTg35mzDDpA8oFv4y59MF7BGs8IergWD2en4QdHug8BPVb1yUWpaDBhM16vLHtaFrsYlgCJinWcYj0Gqa1DvxUk7db045tdPwff809sAK63w7DGWWTT30fG0i+AG72GtKwADMz1yE/RIjGfhD4Blck3E4yC8= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cdb034d-c301-451d-b84a-08d69e4b38bb X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2019 13:38:43.4598 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5380 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When calculating the multipath hash for input routes the flow info is not available and therefore should not be used. Fixes: 24ba14406c5c ("route: Add multipath_hash in flowi_common to make use= r-define hash") Signed-off-by: Ido Schimmel Cc: wenxu --- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 7cf4c8305071..e3ac458b5d8b 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1820,7 +1820,7 @@ static void ip_multipath_l3_keys(const struct sk_buff= *skb, int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4, const struct sk_buff *skb, struct flow_keys *flkeys) { - u32 multipath_hash =3D fl4->flowi4_multipath_hash; + u32 multipath_hash =3D fl4 ? fl4->flowi4_multipath_hash : 0; struct flow_keys hash_keys; u32 mhash; =20 --=20 2.20.1