Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp6128057pxv; Thu, 29 Jul 2021 07:11:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZ1avYg7blZF3Ho1Z6SV/yNGv3NDdTy2sx5U4A3ZyK/Tu3/c+vD202BYG0jG8J0Ih2c+a3 X-Received: by 2002:a5d:89d6:: with SMTP id a22mr4468905iot.178.1627567861503; Thu, 29 Jul 2021 07:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627567861; cv=none; d=google.com; s=arc-20160816; b=DXWn4s3erukRQGk2KqO/NbXay1kQpqHYK5nTXPSZLRt8FVSQTlJalz7JauFMkVJRmG KQq/qYgtl9hnvvkTdtsAXQSa58F11cqJg4MfvtoyRoE9vJrZHVQUFW5bWd/Rdzfsf5mY gRymTRgNe4WsdBt98nG5GDytzwWewhuD3U2rVUwRzQ801BEslYGf+LQ0MwyjqFLJK/j6 a/A22Izw4020NHMZ9baExo51OgBHAwFvGkE0APfljqaXeJdvZdwCI3hP5qh5sHUtyAlS Yc6skXhOGLoO5xdz5uGEZFIwaDEvjOsPdTlhY/O68oSUA2YtTWryyETkRrAtoo1A2kKu B02w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aYSUeHimFi2fokH3T1pGxZL7m57x5NYQtQ+4V7+QHTk=; b=sGRGhG+neZ5rl7uZeUkTT+jl9SvYE0k7NgBze/wLLhhB4iSqrpIcjOayBQAzK46enC YhEgqsXP6Yny9S5I0ajEH3pw5HI5pvhhXMRlWhF2vKxvvluzGKtuZaNipi4oJ5T47B5r at1JO+q7HO4tfitnObUUsIVijaYfdhA10za0R7OPFD4zFmYe4Mo2OVlGTEMYn8Wb3tyQ jeDPfoWz1uqzIBW7uFbgorHYyi5bL96VxYuIX/FcRCMrktHA6L9FjdeYW14NC69iZZoc 4omxGfxTKBipiqRWJ00blPPk3TYXL3WmOS2PrbCG7kTzRx0iqgSEww8/382YY8VutKGH J+mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=z9pvRUtF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y16si3975629jat.56.2021.07.29.07.10.49; Thu, 29 Jul 2021 07:11:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=z9pvRUtF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239132AbhG2OI0 (ORCPT + 99 others); Thu, 29 Jul 2021 10:08:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238160AbhG2OA2 (ORCPT ); Thu, 29 Jul 2021 10:00:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 12E8961076; Thu, 29 Jul 2021 13:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627567180; bh=oHCmvgdufChCJ1pekZL6uygApYoQ8ckTJXK2jyvoiz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z9pvRUtFbhdXK8MhftVxrDgDfJymsNxn04nGwQeBtulJNHD9WOe7chKFriEziJ9tj 2Nwte59xa7LK1QdgI/116KXRVzI+Gpo+Spq4DX12eEf9ifQDdPm90eChGPswXQxBOz D/a50SBSJXDJVZyV7Q3GemqMw62L8QaRpamO8nK0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?S=C3=A9rgio?= , Xin Long , Marcelo Ricardo Leitner , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 07/22] sctp: move 198 addresses from unusable to private scope Date: Thu, 29 Jul 2021 15:54:38 +0200 Message-Id: <20210729135137.568810328@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729135137.336097792@linuxfoundation.org> References: <20210729135137.336097792@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Long [ Upstream commit 1d11fa231cabeae09a95cb3e4cf1d9dd34e00f08 ] The doc draft-stewart-tsvwg-sctp-ipv4-00 that restricts 198 addresses was never published. These addresses as private addresses should be allowed to use in SCTP. As Michael Tuexen suggested, this patch is to move 198 addresses from unusable to private scope. Reported-by: Sérgio Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/sctp/constants.h | 4 +--- net/sctp/protocol.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h index 14a0d22c9113..bf23a2ed92da 100644 --- a/include/net/sctp/constants.h +++ b/include/net/sctp/constants.h @@ -342,8 +342,7 @@ enum { #define SCTP_SCOPE_POLICY_MAX SCTP_SCOPE_POLICY_LINK /* Based on IPv4 scoping , - * SCTP IPv4 unusable addresses: 0.0.0.0/8, 224.0.0.0/4, 198.18.0.0/24, - * 192.88.99.0/24. + * SCTP IPv4 unusable addresses: 0.0.0.0/8, 224.0.0.0/4, 192.88.99.0/24. * Also, RFC 8.4, non-unicast addresses are not considered valid SCTP * addresses. */ @@ -351,7 +350,6 @@ enum { ((htonl(INADDR_BROADCAST) == a) || \ ipv4_is_multicast(a) || \ ipv4_is_zeronet(a) || \ - ipv4_is_test_198(a) || \ ipv4_is_anycast_6to4(a)) /* Flags used for the bind address copy functions. */ diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 25192b378e2e..9b444df5e53e 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -398,7 +398,8 @@ static enum sctp_scope sctp_v4_scope(union sctp_addr *addr) retval = SCTP_SCOPE_LINK; } else if (ipv4_is_private_10(addr->v4.sin_addr.s_addr) || ipv4_is_private_172(addr->v4.sin_addr.s_addr) || - ipv4_is_private_192(addr->v4.sin_addr.s_addr)) { + ipv4_is_private_192(addr->v4.sin_addr.s_addr) || + ipv4_is_test_198(addr->v4.sin_addr.s_addr)) { retval = SCTP_SCOPE_PRIVATE; } else { retval = SCTP_SCOPE_GLOBAL; -- 2.30.2