From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754037AbcHZPei (ORCPT ); Fri, 26 Aug 2016 11:34:38 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56676 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753338AbcHZPeg (ORCPT ); Fri, 26 Aug 2016 11:34:36 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Arnd Bergmann , Hadar Hen Zion , Jiri Pirko , "David S . Miller" , netdev@vger.kernel.org Subject: [PATCH 4/5] net_sched: fix use of uninitialized ethertype variable in cls_flower Date: Fri, 26 Aug 2016 17:25:45 +0200 Message-Id: <20160826152546.604384-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160826152546.604384-1-arnd@arndb.de> References: <20160826152546.604384-1-arnd@arndb.de> X-Provags-ID: V03:K0:XM3PnCWMThejU6AsjZRdb4x8QDoWrdrAL/zaHsjgvs6rvA6PmY2 /5t+nNIqUx7HxUjC8br0wBXejfaMn1kagAHPV6gZMR0eSTnrlw1QKSbV1CTimpMtqyMLt1r P8JbKmVyBbgPgN3xMdDaVPVpWKhG4+vDhm16F54TFNQbxoRjxkOsRI+HJm8SAOtBEAyFilF q9v3eijJqBV5WPofvbpPg== X-UI-Out-Filterresults: notjunk:1;V01:K0:rmIUgfxpSkM=:sY1aPPBcsFNG3lMtwy5hwu iWnGyaSc9eGof7E8+wIzxIc4QqBNfCkLzNfNS8szYObZLFxsqTu8wLVRolYt8j+HG1rjRB2N+ SW0xCbifuiZ94jPois3VTejSaUq88FWfQ3BYRRteOkXHWBIfO++TEWRX/jLyAvu1Qkiaepwvy I3eWCgG+dXjiWXEFl+cYWUA/WIL3nU1Ra/MCvgQOAYeLFCd1MJAlj7S0uNySSqGBPN84jyXfq OwwfCnlQBVtwLn11wllSOasw5kqP90szXCnJMlIxrK08u1J6IIDICH1craEX870+uHO8f99TD l5n8nUix62ayl47uE/0UcJbfG5K9J27GcxjSgK1d0dQJKMRv1xXOvlQV/EcHDCuuI2xIpM4aR RsSzZEnUjZLczreeWfCvTSV3Rx7jKdjIr5GPzPfANl+5avRUiuw5HrQwlp54SoTH8/sR0l9ua FaYGjehiKkyb9RLe9QfL86Ch6BJXc03mYFf4jVkoem5MPA1IDZfCpaLmCQ5LuTlA4CoZoRAsN E2CJec5NYEnEfKx114AoRxk8MdMDb1pvHRQkeqWlMWmKToBgLjalpc2sZT6BJ8AYffUVhdg/I aIChUp5kx3Dvt/85532jgK3ouZkFGcSdDoF/WMYqiCYUSKIDJMMYGFACi45JUD//gbI2HTVC2 +Gl1BcDQCtJHVgu/+3HVRnMTQnlzcnoLGUy3WsBQim4EEmiwnXoLmPnEgpCPD7Rb0t10= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The addition of VLAN support caused a possible use of uninitialized data if we encounter a zero TCA_FLOWER_KEY_ETH_TYPE key, as pointed out by "gcc -Wmaybe-uninitialized": net/sched/cls_flower.c: In function 'fl_change': net/sched/cls_flower.c:366:22: error: 'ethertype' may be used uninitialized in this function [-Werror=maybe-uninitialized] This changes the code to only set the ethertype field if it was nonzero, as before the patch. Signed-off-by: Arnd Bergmann Fixes: 9399ae9a6cb2 ("net_sched: flower: Add vlan support") Cc: Hadar Hen Zion Cc: Jiri Pirko --- Cc: David S. Miller Cc: netdev@vger.kernel.org net/sched/cls_flower.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 532ab6751343..cf9ad5b50889 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -353,18 +353,19 @@ static int fl_set_key(struct net *net, struct nlattr **tb, mask->eth.src, TCA_FLOWER_KEY_ETH_SRC_MASK, sizeof(key->eth.src)); - if (tb[TCA_FLOWER_KEY_ETH_TYPE]) + if (tb[TCA_FLOWER_KEY_ETH_TYPE]) { ethertype = nla_get_be16(tb[TCA_FLOWER_KEY_ETH_TYPE]); - if (ethertype == htons(ETH_P_8021Q)) { - fl_set_key_vlan(tb, &key->vlan, &mask->vlan); - fl_set_key_val(tb, &key->basic.n_proto, - TCA_FLOWER_KEY_VLAN_ETH_TYPE, - &mask->basic.n_proto, TCA_FLOWER_UNSPEC, - sizeof(key->basic.n_proto)); - } else { - key->basic.n_proto = ethertype; - mask->basic.n_proto = cpu_to_be16(~0); + if (ethertype == htons(ETH_P_8021Q)) { + fl_set_key_vlan(tb, &key->vlan, &mask->vlan); + fl_set_key_val(tb, &key->basic.n_proto, + TCA_FLOWER_KEY_VLAN_ETH_TYPE, + &mask->basic.n_proto, TCA_FLOWER_UNSPEC, + sizeof(key->basic.n_proto)); + } else { + key->basic.n_proto = ethertype; + mask->basic.n_proto = cpu_to_be16(~0); + } } if (key->basic.n_proto == htons(ETH_P_IP) || -- 2.9.0