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=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 D309EC4724C for ; Fri, 1 May 2020 13:25:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF2C0208D6 for ; Fri, 1 May 2020 13:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339541; bh=yLAGhYGGTaE/aZWvbpapAKvvx1vDiFdDP466LI3iGdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BMa07NKJ9P5Rvbejbq6dXVxtHFMsLmAjHlCgKELFdezD8zTWMRnOsbtElO2vWVGFB ZgC4z7Ob1nGEEmmEWjWM53bO3K3vwegEiolcefPMVP8DP9nAgHmTN874gMnYGheIOZ a77kacaHpsgx2Nqi7i3yFiV9XXVzYIlT0VNWvJEY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729080AbgEANZk (ORCPT ); Fri, 1 May 2020 09:25:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:46744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729074AbgEANZj (ORCPT ); Fri, 1 May 2020 09:25:39 -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 BA78220757; Fri, 1 May 2020 13:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339539; bh=yLAGhYGGTaE/aZWvbpapAKvvx1vDiFdDP466LI3iGdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=098O2YQ8LWFGGHM9QKPl4C1ZJ3Kq1xFhTii4By9X4NIACHKSiAsA6YkvMwwXkAwlf jPp+DhdR9hJpTKMyn+NbRYiZoJSeI79Le903ZqshseRgpAJOHTXKNke52w6WtCM4h3 s5RJdiws/7JDGcFSKNuDGQBuHahZm4i2oFMl6XHs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Haxby , "David S. Miller" Subject: [PATCH 4.4 18/70] ipv6: fix restrict IPV6_ADDRFORM operation Date: Fri, 1 May 2020 15:21:06 +0200 Message-Id: <20200501131519.694921449@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131513.302599262@linuxfoundation.org> References: <20200501131513.302599262@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: John Haxby [ Upstream commit 82c9ae440857840c56e05d4fb1427ee032531346 ] Commit b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation") fixed a problem found by syzbot an unfortunate logic error meant that it also broke IPV6_ADDRFORM. Rearrange the checks so that the earlier test is just one of the series of checks made before moving the socket from IPv6 to IPv4. Fixes: b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation") Signed-off-by: John Haxby Cc: stable@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ipv6_sockglue.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -185,15 +185,14 @@ static int do_ipv6_setsockopt(struct soc retv = -EBUSY; break; } - } else if (sk->sk_protocol == IPPROTO_TCP) { - if (sk->sk_prot != &tcpv6_prot) { - retv = -EBUSY; - break; - } - break; - } else { + } + if (sk->sk_protocol == IPPROTO_TCP && + sk->sk_prot != &tcpv6_prot) { + retv = -EBUSY; break; } + if (sk->sk_protocol != IPPROTO_TCP) + break; if (sk->sk_state != TCP_ESTABLISHED) { retv = -ENOTCONN; break;