From nobody Mon Feb 9 11:29:46 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp584266jap; Wed, 5 Jan 2022 07:57:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdevVzhXRCN7+NYpUzSwNrGzNg5qQoK48nq66bLQ8VdVktt8QwAb/3+xOC4+OI6aNzmO95 X-Received: by 2002:a17:90a:e7c6:: with SMTP id kb6mr4859500pjb.200.1641398256930; Wed, 05 Jan 2022 07:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641398256; cv=none; d=google.com; s=arc-20160816; b=LatSgeEdt/8oompYCp1VJZ0Mh4qSBrFPTGWmNdw40IXQSWFLLFqWyhGVQLpP8ad0mS nPBQgvjBszuYUg9lgShGV3qYXFUlhQyUtsk0cndKL59waOSJIm1fIlWw+wSWflwRmTix iSKAOXkWNleB92nPr3SvwGpNEX1GIk6owkqNApx37Lk7XeWdeEaZUTncpwuj0lPsVmVB uPMQedb5tpXZeJeyXJpZqctTJZU7Ehh4WLpnZ2V9b4bhcsmmZJ0f6tGRZbCIiHkg1rav tx7DjqmQoAHL2RvXHuz32aFTpDnKmqshNdVUQ9ETYLdvhl/NeYjtQZe8tyMTqOPMqN9p 0ryQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=pZRucwN/iu3JhRKyQBm7cwK6+MBX/OabN6ofIvRd0nQ=; b=Xp2qPyo8vUSGBzenpuioPVr1Fa2/4Ncttb80W8QIKcPYUJuWaZe0vUdScnH0fMH4yi 4WmXS1zX+HnlSn2/W8+VnmsVfJdpnlXqzgxGwy7x1XtLVymeUjh3SmKQdfova3o/HLMf I58m5xGceIzGO88X2DjqwtwSVBtFUSGAmej4G1X8WDNwaJdKFsX0XCfr68fogb86zMEE BFtCxmYxcB9XDxJilLofEtjV3m+8NMnz+jbKhAwXOCaTWK/6UIC8HheRssVJQO1vKeG+ FiXFegyvR4FBSyPR2ay1uluY70/Kr0nqkw+B/aGGFz/Fv6J8D7/alq7teEmF5oW6L54b L0hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=GfGgRMnv; spf=pass (google.com: domain of mptcp+bounces-2911-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2911-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id i13si42415489pli.571.2022.01.05.07.57.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jan 2022 07:57:36 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2911-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=GfGgRMnv; spf=pass (google.com: domain of mptcp+bounces-2911-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2911-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id AF6323E0A57 for ; Wed, 5 Jan 2022 15:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BE6962CA8; Wed, 5 Jan 2022 15:57:34 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92FED2CA2 for ; Wed, 5 Jan 2022 15:57:32 +0000 (UTC) Received: by mail-ed1-f52.google.com with SMTP id m21so165021747edc.0 for ; Wed, 05 Jan 2022 07:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pZRucwN/iu3JhRKyQBm7cwK6+MBX/OabN6ofIvRd0nQ=; b=GfGgRMnvMinVLkUPdGS8nQKDqMYzbAFaQEufsu3NKUNo/lcbzLKWGvoBIxoQ+LSc/3 VNlwQbfLs8k+w1fsHCH53VM0cQPceGi23LfvpLSdF5Shuk44kDfuQNCUG4Fjy+uCaiWr EbN/D0adfCVE6lAw6iqfYpN3MmvDGvedXDLmeh9XYz8NNz/M4skIP9RJ3Ka2QtQIEHbv N/hPY63yvqPIgHXhCUwDONq1BF3tPDokdNfI6kBnREPoJyFPdE0C4tojZtwiU4kuNtLy y72u6Oj+aBlXGMx2GZAIB4b1uoZqk4bdk3qFZyQKS/CdvA565gSSexDwPPdThqRECoq9 C9rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pZRucwN/iu3JhRKyQBm7cwK6+MBX/OabN6ofIvRd0nQ=; b=AgyrpzCcQUtUE1iymOYSXFdsEe0zN2ixSLzq34L5HjxupmZ3EELWha7rHWQHJu67Bp h/WoLKbVZeN9WCJRykFRnjqasYrqEpitGHZsWxaEFR1DBaMx9JJSgRC1HptFzrtVB7e2 s0cGy9qkt//NryrjtHqSgOTRr2fIHZiV82tCUlHI/y6rg9hwcmZ6tK9+NkZbPYjw9LyH LfJjNb+rJ+7nTWhrnqAGbDiJe4QwmaiNy5AtFFpCxHvhK8euq1FQ1yIexZeVdEj2mMao UGD7PQUbBRKObVMn3mEup5DYaZrJ0VgEFT4Ax/sd0lf6A/W20WXcUZoFKnhj0YHqiEzj J4EA== X-Gm-Message-State: AOAM531jf6u1f8+PyZukZgljjtCVhg046VUbzC3rF12zXh5URxgu+B9u 60wJowZRWuNVyctsdDKg2A7CS+tbgmL5bHD9OCU= X-Received: by 2002:a17:906:7954:: with SMTP id l20mr42833590ejo.358.1641398250744; Wed, 05 Jan 2022 07:57:30 -0800 (PST) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id c30sm12399684ejj.190.2022.01.05.07.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 07:57:30 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v8 3/8] mptcp: fix a DSS option writing error Date: Wed, 5 Jan 2022 16:56:57 +0100 Message-Id: <20220105155702.165123-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220105155702.165123-1-matthieu.baerts@tessares.net> References: <20220105155702.165123-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang 'ptr +=3D 1;' was omitted in the original code. If the DSS is the last option -- which is what we have most of the time -- that's not an issue. Fixes: 1bff1e43a30e ("mptcp: optimize out option generation") Signed-off-by: Geliang Tang Signed-off-by: Matthieu Baerts --- net/mptcp/options.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 36ab69906af3..bbf61dedb4b5 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1334,6 +1334,7 @@ void mptcp_write_options(__be32 *ptr, const struct tc= p_sock *tp, put_unaligned_be32(mpext->data_len << 16 | TCPOPT_NOP << 8 | TCPOPT_NOP, ptr); } + ptr +=3D 1; } } else if (OPTIONS_MPTCP_MPC & opts->suboptions) { u8 len, flag =3D MPTCP_CAP_HMAC_SHA256; --=20 2.33.1