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 585F3C433F5 for ; Mon, 7 Mar 2022 22:31:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343741AbiCGWc0 (ORCPT ); Mon, 7 Mar 2022 17:32:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236396AbiCGWcZ (ORCPT ); Mon, 7 Mar 2022 17:32:25 -0500 Received: from v-zimmta03.u-bordeaux.fr (v-zimmta03.u-bordeaux.fr [147.210.215.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF7A22DD68; Mon, 7 Mar 2022 14:31:28 -0800 (PST) Received: from v-zimmta03.u-bordeaux.fr (localhost [127.0.0.1]) by v-zimmta03.u-bordeaux.fr (Postfix) with ESMTP id EBCB818014AC; Mon, 7 Mar 2022 23:31:26 +0100 (CET) Received: from begin.home (lfbn-bor-1-255-114.w90-50.abo.wanadoo.fr [90.50.98.114]) by v-zimmta03.u-bordeaux.fr (Postfix) with ESMTPSA id B0F3918014A5; Mon, 7 Mar 2022 23:31:26 +0100 (CET) Received: from samy by begin.home with local (Exim 4.95) (envelope-from ) id 1nRLt0-00C9Ci-8c; Mon, 07 Mar 2022 23:31:26 +0100 Date: Mon, 7 Mar 2022 23:31:26 +0100 From: Samuel Thibault To: davem@davemloft.net, kuba@kernel.org Cc: Willem de Bruijn , linux-kernel@vger.kernel.org, Network Development Subject: [PATCHv2] SO_ZEROCOPY should return -EOPNOTSUPP rather than -ENOTSUPP Message-ID: <20220307223126.djzvg44v2o2jkjsx@begin> Mail-Followup-To: Samuel Thibault , davem@davemloft.net, kuba@kernel.org, Willem de Bruijn , linux-kernel@vger.kernel.org, Network Development MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) X-AV-Checked: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ENOTSUPP is documented as "should never be seen by user programs", and thus not exposed in , and thus applications cannot safely check against it (they get "Unknown error 524" as strerror). We should rather return the well-known -EOPNOTSUPP. This is similar to 2230a7ef5198 ("drop_monitor: Use correct error code") and 4a5cdc604b9c ("net/tls: Fix return values to avoid ENOTSUPP"), which did not seem to cause problems. Signed-off-by: Samuel Thibault --- Difference with v1: use -EOPNOTSUPP instead of -ENOPROTOOPT. diff --git a/net/core/sock.c b/net/core/sock.c index 4ff806d71921..839eb076afee 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 = -EOPNOTSUPP; } else if (sk->sk_family != PF_RDS) { - ret = -ENOTSUPP; + ret = -EOPNOTSUPP; } if (!ret) { if (val < 0 || val > 1)