Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp2495310rwb; Mon, 3 Oct 2022 01:18:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IzgrvOPUspuYwf5GcQBQbEs3xFNwIAUB1StymNo+RPNZYt1QIskAGtn273gr0fDKEkHHE X-Received: by 2002:a17:902:db12:b0:178:1f91:74e6 with SMTP id m18-20020a170902db1200b001781f9174e6mr21332928plx.100.1664785082383; Mon, 03 Oct 2022 01:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664785082; cv=none; d=google.com; s=arc-20160816; b=MnJDp6lZ4u2dm8BvxCRBi/RPtAHEvYZS/GsIbbiAmolPoR4sIhOuNU3c5wW2+tO4os UNa5Ufr8DChxm8VPu8kmmfuRy+izD43ToSP5cZjbEb6tWJ/RiY6JoUjJMBEAXGb5HKkl Jd1VAOapQmuRbVhHufk2gfxz05llGAoA5/3Fac7JYLGvbUJEF2MsbhWdPqKUJlq913bd I92/NdH3UnsCBNvSkWjhTXOhED9Xoy2tMiSMvuWpBVZlz7TCWk4lwhlypPaNVeu/oJ4w +bjNqX/nDFZ5lDLyFAz27sZcuKmfPBRDz6UscqJBmeRUyPo03sHjoUHVk6o/aEU7TGQY b2Gw== 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=7bspsmd9IMRuwGaeUz23LCgtyhfeTfDTOPOqx0F87ns=; b=BPW3bldT1VK7Ugnp8l37Ji3kZW65tXD3cCyomnBQnhihEmIh+tZ3xPyVmLMy0I/757 lxFSBIJg8I758fIFISpHlSy2N1tMYYAU/QDYKHoYCY5yT/3tsaA6Fs43BoNiD4EUMvHZ 4SaEiOGL6/gS5cnMgJowrxQvrwOem1TgSdDD1K+gwPW9OlVgefcpY0/TI6vtFaje0R3n L2IgTQXdqUdwkYKYJ3U6p5RYpGaotcpwoLgs5GhRk3Mh4+lMNWn6MlkcoCdtsLM8y8/w gxn4lcVd5keF8fYW3VnblBTLSyeaLfGDqJZrgEs8muYw+95WPVnjwXtFi7rfE3z9QRng P6Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N4HBTwJW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f5-20020a63de05000000b0043c24cec6b4si9979394pgg.739.2022.10.03.01.17.51; Mon, 03 Oct 2022 01:18:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N4HBTwJW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231596AbiJCHhP (ORCPT + 99 others); Mon, 3 Oct 2022 03:37:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231495AbiJCHfD (ORCPT ); Mon, 3 Oct 2022 03:35:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11A8F53037; Mon, 3 Oct 2022 00:22:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CBD40B80E9B; Mon, 3 Oct 2022 07:22:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 265D7C433C1; Mon, 3 Oct 2022 07:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664781743; bh=HzWNp5YyPkS2fPfnmk/Ug6wOXveeiRA34eO/DWm4nXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N4HBTwJWCocohKeXiYw6Bmz28iZJ68UWWw6MH11oG9OqPPS51Ac0sNccgiKMsVPsK IjC8BFPTzHy6pnZ75uLlN19ZJRllaijN8zfsDwJWdR7XBEPGcIwvQrdlDI4uWVb/ln ++ZSZPgIHX6QkTNRBBxc3abUHfE2iWVQBCLdoGPk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wang Yufen , Paolo Abeni , Sasha Levin Subject: [PATCH 5.10 47/52] selftests: Fix the if conditions of in test_extra_filter() Date: Mon, 3 Oct 2022 09:11:54 +0200 Message-Id: <20221003070720.127941600@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221003070718.687440096@linuxfoundation.org> References: <20221003070718.687440096@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Yufen [ Upstream commit bc7a319844891746135dc1f34ab9df78d636a3ac ] The socket 2 bind the addr in use, bind should fail with EADDRINUSE. So if bind success or errno != EADDRINUSE, testcase should be failed. Fixes: 3ca8e4029969 ("soreuseport: BPF selection functional test") Signed-off-by: Wang Yufen Link: https://lore.kernel.org/r/1663916557-10730-1-git-send-email-wangyufen@huawei.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- tools/testing/selftests/net/reuseport_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c index b5277106df1f..b0cc082fbb84 100644 --- a/tools/testing/selftests/net/reuseport_bpf.c +++ b/tools/testing/selftests/net/reuseport_bpf.c @@ -330,7 +330,7 @@ static void test_extra_filter(const struct test_params p) if (bind(fd1, addr, sockaddr_size())) error(1, errno, "failed to bind recv socket 1"); - if (!bind(fd2, addr, sockaddr_size()) && errno != EADDRINUSE) + if (!bind(fd2, addr, sockaddr_size()) || errno != EADDRINUSE) error(1, errno, "bind socket 2 should fail with EADDRINUSE"); free(addr); -- 2.35.1