From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51988 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751173AbeCIBT4 (ORCPT ); Thu, 8 Mar 2018 20:19:56 -0500 Subject: Patch "net: mpls: Pull common label check into helper" has been added to the 4.4-stable tree To: ben.hutchings@codethink.co.uk, davem@davemloft.net, dsahern@gmail.com, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 08 Mar 2018 17:19:50 -0800 In-Reply-To: <20180308183616.f67hvcpphsu3oao2@xylophone.i.decadent.org.uk> Message-ID: <152055839015628@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled net: mpls: Pull common label check into helper to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-mpls-pull-common-label-check-into-helper.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ben.hutchings@codethink.co.uk Thu Mar 8 17:17:46 2018 From: Ben Hutchings Date: Thu, 8 Mar 2018 18:36:16 +0000 Subject: net: mpls: Pull common label check into helper To: Greg Kroah-Hartman Cc: David Ahern , "David S. Miller" , stable@vger.kernel.org Message-ID: <20180308183616.f67hvcpphsu3oao2@xylophone.i.decadent.org.uk> Content-Disposition: inline From: David Ahern commit b7b386f42f079b25b942c756820e36c6bd09b2ca upstream. mpls_route_add and mpls_route_del have the same checks on the label. Move to a helper. Avoid duplicate extack messages in the next patch. Signed-off-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- net/mpls/af_mpls.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -714,6 +714,19 @@ errout: return err; } +static bool mpls_label_ok(struct net *net, unsigned int index) +{ + /* Reserved labels may not be set */ + if (index < MPLS_LABEL_FIRST_UNRESERVED) + return false; + + /* The full 20 bit range may not be supported. */ + if (index >= net->mpls.platform_labels) + return false; + + return true; +} + static int mpls_route_add(struct mpls_route_config *cfg) { struct mpls_route __rcu **platform_label; @@ -732,12 +745,7 @@ static int mpls_route_add(struct mpls_ro index = find_free_label(net); } - /* Reserved labels may not be set */ - if (index < MPLS_LABEL_FIRST_UNRESERVED) - goto errout; - - /* The full 20 bit range may not be supported. */ - if (index >= net->mpls.platform_labels) + if (!mpls_label_ok(net, index)) goto errout; /* Append makes no sense with mpls */ @@ -798,12 +806,7 @@ static int mpls_route_del(struct mpls_ro index = cfg->rc_label; - /* Reserved labels may not be removed */ - if (index < MPLS_LABEL_FIRST_UNRESERVED) - goto errout; - - /* The full 20 bit range may not be supported */ - if (index >= net->mpls.platform_labels) + if (!mpls_label_ok(net, index)) goto errout; mpls_route_update(net, index, NULL, &cfg->rc_nlinfo); @@ -1162,10 +1165,9 @@ static int rtm_to_route_config(struct sk &cfg->rc_label)) goto errout; - /* Reserved labels may not be set */ - if (cfg->rc_label < MPLS_LABEL_FIRST_UNRESERVED) + if (!mpls_label_ok(cfg->rc_nlinfo.nl_net, + cfg->rc_label)) goto errout; - break; } case RTA_VIA: Patches currently in stable-queue which might be from ben.hutchings@codethink.co.uk are queue-4.4/x86-spectre-fix-an-error-message.patch queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch queue-4.4/net-mpls-pull-common-label-check-into-helper.patch queue-4.4/x86-apic-vector-handle-legacy-irq-data-correctly.patch queue-4.4/mpls-nospec-sanitize-array-index-in-mpls_label_ok.patch