From patchwork Wed Apr 11 12:58:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 897172 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k4fieN67"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40LkcB0tdhz9s35 for ; Wed, 11 Apr 2018 22:58:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753577AbeDKM6Q (ORCPT ); Wed, 11 Apr 2018 08:58:16 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:38985 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbeDKM6O (ORCPT ); Wed, 11 Apr 2018 08:58:14 -0400 Received: by mail-pg0-f67.google.com with SMTP id b9so735558pgf.6; Wed, 11 Apr 2018 05:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=fy1whYDeApBnFRn3AHm+eaZt4pwGVRrZCuxpe3gdEeo=; b=k4fieN67fSHE+0kaBc3Q0SBV4Ey09qf7pnVzfXSnTMO577cL+aiUyyCMYhlsqgaJG8 oqmT3ibg4mxtl7T4B1z7IfhCBAUUKsAdAH8mJVpuysa2yp/RtTxQG0MaKoDzGqvO5PrI ERy9n7A31/VQtu1D88yjsCeuUOtfTSwpY9P4T+M3c8K2uXMmzr5rUXSJIE5edF+H3n7F PgwMOPcvrZtKiVToqr4CB1S6JrWMkoFCW46Y7+NjCDgELB6TqbuOUQjQr+5BdW0MnACZ RKo5lBIPpdRPuEoF8xtrXSHNbehkBC1BSGB1QGZM5637RXOvGM8D9CFgBOe6zxOUz7mv o11g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fy1whYDeApBnFRn3AHm+eaZt4pwGVRrZCuxpe3gdEeo=; b=R79XNiaFM9d5PSy2G857t5m8goNzH9pSPDEszKvddK/Uwj5vL+GqcDycL26TIa+nCx rE+a/O8GChzofaxCGRQzH8a/JIdYDs3XtUTpd4TX/CIbXAySkcUHEDGjjfkMsT7CYnAv /eCAmw34pPO7PlSY5Zs4APF8/THwxPbLF+FhjbNNwqNAVah4e0Cx4VXVsbz9Ak9atIBv ZxIs5Izy7sNrf5RhxRjXHeFe7rM3JFTYSPICCM3KqDitda4C5ONXsD1tC5FDdJkez532 g0uJ9AmKEA8m0ttJ1RI6hIKBdFZ8iyY71NLWxH1ukRmaoPtYEDNQh6MGiDjgyhS0VMKS TKAw== X-Gm-Message-State: ALQs6tCFXxC87fP9IQUUwqJ0mgT/bV/9/bECm2zV9My8S1tOa5QaVMQ1 g7CfPwvVQwuCmIJ+voo612NcCSqQ X-Google-Smtp-Source: AIpwx48jxk+Ex2gZWQ95NYoHFRt2n/n7UgkhDr09tHPMXOPxkHHA6Tx29Zhx44AYBaIC+3wqTFns/A== X-Received: by 10.98.202.24 with SMTP id n24mr3994706pfg.45.1523451494083; Wed, 11 Apr 2018 05:58:14 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id b187sm2958217pfg.164.2018.04.11.05.58.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Apr 2018 05:58:13 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net] sctp: do not check port in sctp_inet6_cmp_addr Date: Wed, 11 Apr 2018 20:58:05 +0800 Message-Id: <340aad3be762046ca9d02e54edba5bfefa2f4e71.1523451485.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org pf->cmp_addr() is called before binding a v6 address to the sock. It should not check ports, like in sctp_inet_cmp_addr. But sctp_inet6_cmp_addr checks the addr by invoking af(6)->cmp_addr, sctp_v6_cmp_addr where it also compares the ports. This would cause that setsockopt(SCTP_SOCKOPT_BINDX_ADD) could bind multiple duplicated IPv6 addresses after Commit 40b4f0fd74e4 ("sctp: lack the check for ports in sctp_v6_cmp_addr"). This patch is to remove af->cmp_addr called in sctp_inet6_cmp_addr, but do the proper check for both v6 addrs and v4mapped addrs. Fixes: 40b4f0fd74e4 ("sctp: lack the check for ports in sctp_v6_cmp_addr") Reported-by: Jianwen Ji Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner --- net/sctp/ipv6.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index f1fc48e..be4b72c 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -846,8 +846,8 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1, const union sctp_addr *addr2, struct sctp_sock *opt) { - struct sctp_af *af1, *af2; struct sock *sk = sctp_opt2sk(opt); + struct sctp_af *af1, *af2; af1 = sctp_get_af_specific(addr1->sa.sa_family); af2 = sctp_get_af_specific(addr2->sa.sa_family); @@ -863,10 +863,31 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1, if (sctp_is_any(sk, addr1) || sctp_is_any(sk, addr2)) return 1; - if (addr1->sa.sa_family != addr2->sa.sa_family) + if (addr1->sa.sa_family != addr2->sa.sa_family) { + if (addr1->sa.sa_family == AF_INET && + addr2->sa.sa_family == AF_INET6 && + ipv6_addr_v4mapped(&addr2->v6.sin6_addr)) + if (addr2->v6.sin6_addr.s6_addr32[3] == + addr1->v4.sin_addr.s_addr) + return 1; + if (addr2->sa.sa_family == AF_INET && + addr1->sa.sa_family == AF_INET6 && + ipv6_addr_v4mapped(&addr1->v6.sin6_addr)) + if (addr1->v6.sin6_addr.s6_addr32[3] == + addr2->v4.sin_addr.s_addr) + return 1; + return 0; + } + + if (!ipv6_addr_equal(&addr1->v6.sin6_addr, &addr2->v6.sin6_addr)) + return 0; + + if ((ipv6_addr_type(&addr1->v6.sin6_addr) & IPV6_ADDR_LINKLOCAL) && + addr1->v6.sin6_scope_id && addr2->v6.sin6_scope_id && + addr1->v6.sin6_scope_id != addr2->v6.sin6_scope_id) return 0; - return af1->cmp_addr(addr1, addr2); + return 1; } /* Verify that the provided sockaddr looks bindable. Common verification,