Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3914798pxf; Mon, 29 Mar 2021 15:25:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTQaFHTV1QLNdIxpnCs34MCwHADiEpor79NRzRVrsVpllqvo4Yr8JD7aePEb3DZmwmza1L X-Received: by 2002:a17:906:7d7:: with SMTP id m23mr31024257ejc.205.1617056749683; Mon, 29 Mar 2021 15:25:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617056749; cv=none; d=google.com; s=arc-20160816; b=mfW89yXxHQ7jaswUg0c8UMw7WuJKKPbS/p/6/vkAuQqm+eLcEc0zx3WTGcRjlfaEoE RdxUFfmVa9h497rakeE+xDNw/dkkqqMZ0QIu2ZX0oVeI/ovCs65CO2+I9AFCSuceFNrT nCHX0Lke2H/4JC2Xd4fsogIAb4vAEMuzY4UOIb0hJtpqaU/ZZc6ab6OkRMeKPQGEn+EA DwuWlF8Vw/815wbcqkZ/tWLCsLBEhHYw5bZyS/r6AI/A/yHrVhxlipk72JxXQVNAxOHJ NZKULEe53st/1Lapy+4EgJOgXx/3FdWZn5z89uXM+Ghph/gyO50K/NAcwn514rRgHQz/ QEwQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dhCchNCP+22g40EeHLgeBhBCqfOmbbNS2QY+GT1xQ3g=; b=PIEFDKI6gCZVIHTcs5c5B24THvAHcqhQa0KuerCw/Ng6mPIyUqQDz1yG8qz3VUcF5j QTL71+ioc6hV7p11dSodY4MpTN688HEF0bkgc7Orv9BJPeyk57FXYwY28IlT2KQM0hFB F9qE7ZNvW6B07hv8omhJg24ZsE0PsE5GP/5tU7WW/xbpuo/jZlBI7vBQ0/AIT6b4E2yY oXY/JSK+mLRR/hY7y7NSKgQ7IK50o5KOLk5auPXlfbPfJhPcvoYEsIkFz8OiB4dM4fSB eTo1qpYpAJB8CwCEiW75yNm2NsFnyRydBia/UqCKThOPGnYOW3ueKQ/mrW1EwnK0aOpS 4NnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oqG+829l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id se19si13465108ejb.119.2021.03.29.15.25.26; Mon, 29 Mar 2021 15:25:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oqG+829l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232486AbhC2WYe (ORCPT + 99 others); Mon, 29 Mar 2021 18:24:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:46566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231862AbhC2WWf (ORCPT ); Mon, 29 Mar 2021 18:22:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A30F561997; Mon, 29 Mar 2021 22:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617056553; bh=kOujJ64lk4ZjIev0NMFLYLG5QfMNx+7zWxDaYstGh6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oqG+829l4erwe5miK5sydNUCa9M4VbgXIUg264+YwV2/mOB+WtiW5GDYp916vhmiC 9bN+Ml62SEmIhvueYvpTgayTykPA2BZK2ILmopHwZX+1Ddn30EDtyyA9x+uUbF1RFi yWE3fUGA0VuRDrqFWWlF+Z60xHHuhC0c1frSMsjlnninkCS99TeDxiqF1NQEMSfwoL 6Jul3IOEOpRQ3WMINskJmiOId43oJprZ7qIFB8L3XOtk5uxGRNrq+gpYCaTZHnhd/s SmV/zN7tmFu/82MxClmAiFcggd6xICbqezXQQDM2knfXGr3JGZMPBxJSoSf8bVUs0x JvX9MUGHUMNmg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: liuyacan , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 09/33] net: correct sk_acceptq_is_full() Date: Mon, 29 Mar 2021 18:21:57 -0400 Message-Id: <20210329222222.2382987-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329222222.2382987-1-sashal@kernel.org> References: <20210329222222.2382987-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: liuyacan [ Upstream commit f211ac154577ec9ccf07c15f18a6abf0d9bdb4ab ] The "backlog" argument in listen() specifies the maximom length of pending connections, so the accept queue should be considered full if there are exactly "backlog" elements. Signed-off-by: liuyacan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/sock.h b/include/net/sock.h index 253202dcc5e6..8cdc009d7636 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -930,7 +930,7 @@ static inline void sk_acceptq_added(struct sock *sk) static inline bool sk_acceptq_is_full(const struct sock *sk) { - return READ_ONCE(sk->sk_ack_backlog) > READ_ONCE(sk->sk_max_ack_backlog); + return READ_ONCE(sk->sk_ack_backlog) >= READ_ONCE(sk->sk_max_ack_backlog); } /* -- 2.30.1