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=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,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 15D88C04A6B for ; Mon, 6 May 2019 14:52:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D38132053B for ; Mon, 6 May 2019 14:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154349; bh=CIKD/B1Zm0gtqABATy0oarRntlk7GQ5gB5VoW1963I4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wgeKdjP2FdWz3+RGGM/d1zBfi8V1ixRYeqF8VBSSSPVQyDLXz0VnnMmsNx/CvjjAH fg7FuKRh73yHC4r2jekGG6gJHq6JjMv3Xqs42hLF0n4YemWA/M6rldERnSvWUmelpf YAOes7XWteuUYU3fFYkHHkyvcHiTpxoiXmzhGdFk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729439AbfEFOsT (ORCPT ); Mon, 6 May 2019 10:48:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:48496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729434AbfEFOsT (ORCPT ); Mon, 6 May 2019 10:48:19 -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 45B91205ED; Mon, 6 May 2019 14:48:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154098; bh=CIKD/B1Zm0gtqABATy0oarRntlk7GQ5gB5VoW1963I4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWNAqFnA04PK5r4bubQqfHeKemj+vRCSgE8o7kiM5T3fK6uC3h4IOHaSNoVMQd63c ez/qbxAmpEPntDK3P1J9iKqH7YtEsSYbmcwmcCm8c1qwHZkgg4uMGR/OPVLXJ6MyIl H/rkxyEbFxx74GjjCJTPIWgYlzK4SHOP7vVE0QWU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Willem de Bruijn , "David S. Miller" Subject: [PATCH 4.9 04/62] ipv6: invert flowlabel sharing check in process and user mode Date: Mon, 6 May 2019 16:32:35 +0200 Message-Id: <20190506143051.480285593@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143051.102535767@linuxfoundation.org> References: <20190506143051.102535767@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: Willem de Bruijn [ Upstream commit 95c169251bf734aa555a1e8043e4d88ec97a04ec ] A request for a flowlabel fails in process or user exclusive mode must fail if the caller pid or uid does not match. Invert the test. Previously, the test was unsafe wrt PID recycling, but indeed tested for inequality: fl1->owner != fl->owner Fixes: 4f82f45730c68 ("net ip6 flowlabel: Make owner a union of struct pid* and kuid_t") Signed-off-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6_flowlabel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -640,9 +640,9 @@ recheck: if (fl1->share == IPV6_FL_S_EXCL || fl1->share != fl->share || ((fl1->share == IPV6_FL_S_PROCESS) && - (fl1->owner.pid == fl->owner.pid)) || + (fl1->owner.pid != fl->owner.pid)) || ((fl1->share == IPV6_FL_S_USER) && - uid_eq(fl1->owner.uid, fl->owner.uid))) + !uid_eq(fl1->owner.uid, fl->owner.uid))) goto release; err = -ENOMEM;