From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 272FDC433EF for ; Tue, 1 Mar 2022 14:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234889AbiCAOyM (ORCPT ); Tue, 1 Mar 2022 09:54:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231182AbiCAOyI (ORCPT ); Tue, 1 Mar 2022 09:54:08 -0500 X-Greylist: delayed 508 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 01 Mar 2022 06:53:25 PST Received: from v-zimmta03.u-bordeaux.fr (v-zimmta03.u-bordeaux.fr [147.210.215.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB9F24EA35 for ; Tue, 1 Mar 2022 06:53:24 -0800 (PST) Received: from v-zimmta03.u-bordeaux.fr (localhost [127.0.0.1]) by v-zimmta03.u-bordeaux.fr (Postfix) with ESMTP id 140081800A87; Tue, 1 Mar 2022 15:44:54 +0100 (CET) Received: from begin (nat-inria-interne-54-gw-02-bso.bordeaux.inria.fr [194.199.1.54]) by v-zimmta03.u-bordeaux.fr (Postfix) with ESMTPSA id D81FB1800A80; Tue, 1 Mar 2022 15:44:53 +0100 (CET) Received: from samy by begin with local (Exim 4.95) (envelope-from ) id 1nP3kD-00Bpvn-NJ; Tue, 01 Mar 2022 15:44:53 +0100 Date: Tue, 1 Mar 2022 15:44:53 +0100 From: Samuel Thibault To: willemb@google.com Cc: davem@davemloft.net, kuba@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] SO_ZEROCOPY should rather return -ENOPROTOOPT Message-ID: <20220301144453.snstwdjy3kmpi4zf@begin> Mail-Followup-To: Samuel Thibault , willemb@google.com, davem@davemloft.net, kuba@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-AV-Checked: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ENOTSUPP is documented as "should never be seen by user programs", and is not exposed in , so applications cannot safely check against it. We should rather return the well-known -ENOPROTOOPT. Signed-off-by: Samuel Thibault diff --git a/net/core/sock.c b/net/core/sock.c index 4ff806d71921..6e5b84194d56 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1377,9 +1377,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname, if (!(sk_is_tcp(sk) || (sk->sk_type == SOCK_DGRAM && sk->sk_protocol == IPPROTO_UDP))) - ret = -ENOTSUPP; + ret = -ENOPROTOOPT; } else if (sk->sk_family != PF_RDS) { - ret = -ENOTSUPP; + ret = -ENOPROTOOPT; } if (!ret) { if (val < 0 || val > 1)