From patchwork Thu Nov 21 15:41:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Abeni X-Patchwork-Id: 1199011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="K9vRmtKt"; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47JkMb2w8cz9sPv for ; Fri, 22 Nov 2019 02:42:18 +1100 (AEDT) Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EC047100DC2C1; Thu, 21 Nov 2019 07:42:48 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=205.139.110.120; helo=us-smtp-1.mimecast.com; envelope-from=pabeni@redhat.com; receiver= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B4435100EA55C for ; Thu, 21 Nov 2019 07:42:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574350931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0PmTZbEfUYhs587oJlg0K/HjKOtRfkxKdP7DWJleHA=; b=K9vRmtKt5ktJSC4lZpTDEWfxS9ya4r2gVZX6icMphM8C0PFwnA/VQxKKVdDNdG4nsjm2RH FXkEt0bh1yi0JiEoaA89SAr3hsC7aQRCeAA8YU/+ILTXhupcEIg3+q/qrP41zWdFEdAgiv 4IgwQxjn1PE6GbSyLD2iptJq0iTh4u4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-IwiDlq3BME2ALx6P__8hNA-1; Thu, 21 Nov 2019 10:42:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05B968A6F7F; Thu, 21 Nov 2019 15:42:08 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-89.ams2.redhat.com [10.36.117.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 220885D77F; Thu, 21 Nov 2019 15:42:06 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.01.org Cc: Matthieu Baerts Date: Thu, 21 Nov 2019 16:41:49 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: IwiDlq3BME2ALx6P__8hNA-1 X-Mimecast-Spam-Score: 0 Message-ID-Hash: T2C7A2LISSNZK54I2SHDGCJLYXYXCA7A X-Message-ID-Hash: T2C7A2LISSNZK54I2SHDGCJLYXYXCA7A X-MailFrom: pabeni@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH 0/3] mptcp: fix for ipv6-related oops List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: We need to allocate a larger struct sock for mptcp v6 master sockets, otherwise inet6_sk() will access mptcp related data instead of struct ipv6_pinfo. This should fix the crash reported by Matt. The protocol.c code changes are split in 2 patches to simplify the squashing. (yep, I know we somewhat agreed to big giant rebase, but this specific should be trivial). Additionally adds some fixlet for the ipv6 tests v1 -> v2: - address Matt feedback on patches 1 && 2 - add missing mptcp_v6 proto registration (I don't know why the previous iteration of these patches did not explode without that!!! :((( Paolo Abeni (3): selftests: fixup for IPv6 tests mptcp: use ipv6-specific proto struct mptcp/ipv6: mptcp_v6_prot needs costom destroy. net/mptcp/protocol.c | 24 +++++++++++-- .../selftests/net/mptcp/mptcp_connect.sh | 34 ++++++------------- 2 files changed, 33 insertions(+), 25 deletions(-)