From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D335F279DA4; Thu, 2 Oct 2025 18:54:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759431266; cv=none; b=ZYLVUoIgAAeo2eim67JV3LqMIaJFXc2KfuSRXUbu4V39N1xzRDrJ4JIK+bejVjRboNus8Y36brEEWCnzk0JHY/HnLyYvZDg3XNAbTizin/C+swNbQUYxtG47Y6Mp+YYvTgzd9ok81ZHgSlZZC8PrFz5jS4aziYYpmzWU0jnOyGg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759431266; c=relaxed/simple; bh=yug1rTG6Jmv8Tho+QB+2EP7wv3sxXqojKTh72Aa1DYU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Dd6j68akajpVantp1R0191qXqvp1hCA9QWfP2tNkoMQX7Kk/+HPZF1PaaRbiTkMWLHZAcdj5U3l8pKRovvkP/2duoM482vokzi3AInSKaxa0XGZl6MX/ipynMJmQcCBFfZ1ZteYeetF/Wy49RlMC87BXSGk+mlLmEjkeQ1Vj66s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dDV0SCC5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dDV0SCC5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FEAFC4CEF4; Thu, 2 Oct 2025 18:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759431266; bh=yug1rTG6Jmv8Tho+QB+2EP7wv3sxXqojKTh72Aa1DYU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=dDV0SCC5fdf9OmipObkpzhLd+Xw/B81qnXZd2qtFB9iQoj6a8cJzYwhyGNuI+bhCm LIgIlE482M+kk8xBTBQ4aIt0qWQb+pgQaCf2ZNsAY6/YD7XCuRwT5DioF3vA3SQBCc 8Qw/QqdPALnlRBYlL6Z0d+aow+sb/RW5B83seFZb21iYmVonWeh1uZlSGVFFXpdrnU bQkf8HTNaKt9Vn42ieGX8TTOnpa/FqarRtiil+ZfHW8UepbJqDYLS5q+YP7uynDllg ElcHmfEC5zE169nf3cmQhSCqLlOWVk3ge99UVgYMyj0tjmRUg4TFgL04j06WityU6P N3JxeJH2eQfSg== Message-ID: <77d23523-be4d-4c5a-aa54-8617e7b5e6e2@kernel.org> Date: Thu, 2 Oct 2025 20:54:22 +0200 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH 6.1.y] selftests: mptcp: connect: fix build regression caused by backport Content-Language: en-GB, fr-BE To: Kenta Akagi , gregkh@linuxfoundation.org, sashal@kernel.org Cc: stable@vger.kernel.org, MPTCP Upstream References: <20251002141759.76891-1-k@mgml.me> From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: <20251002141759.76891-1-k@mgml.me> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi Kenta, On 02/10/2025 16:17, Kenta Akagi wrote: > Since v6.1.154, mptcp selftests have failed to build with the following > errors: > > mptcp_connect.c: In function ‘main_loop_s’: > mptcp_connect.c:1040:59: error: ‘winfo’ undeclared (first use in this function) > 1040 | err = copyfd_io(fd, remotesock, 1, true, &winfo); > | ^~~~~ > mptcp_connect.c:1040:59: note: each undeclared identifier is reported only once for each function it appears in > mptcp_connect.c:1040:23: error: too many arguments to function ‘copyfd_io’; expected 4, have 5 > 1040 | err = copyfd_io(fd, remotesock, 1, true, &winfo); > | ^~~~~~~~~ ~~~~~~ > mptcp_connect.c:845:12: note: declared here > 845 | static int copyfd_io(int infd, int peerfd, int outfd, bool close_peerfd) > | ^~~~~~~~~ > > This is caused by commit ff160500c499 ("selftests: mptcp: connect: catch > IO errors on listen side"), a backport of upstream 14e22b43df25, > which attempts to use the undeclared variable 'winfo' and passes too many > arguments to copyfd_io(). Both the winfo variable and the updated > copyfd_io() function were introduced in upstream > commit ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener"), > which is not present in v6.1.y. > > The goal of the backport is to stop on errors from copyfd_io. > Therefore, the backport does not depend on the changes in upstream > commit ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener"). > > This commit simply removes ', &winfo' to fix a build failure. Thank you for this fix for v6.1.y! Reviewed-by: Matthieu Baerts (NGI0) Cheers, Matt -- Sponsored by the NGI0 Core fund.