From patchwork Tue Dec 3 22:44:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Vidic X-Patchwork-Id: 1203895 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=valentin-vidic.from.hr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=valentin-vidic.from.hr header.i=@valentin-vidic.from.hr header.b="IboLnfXA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47SHcG72Zhz9sPh for ; Wed, 4 Dec 2019 10:04:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730184AbfLCXE3 (ORCPT ); Tue, 3 Dec 2019 18:04:29 -0500 Received: from valentin-vidic.from.hr ([94.229.67.141]:59581 "EHLO valentin-vidic.from.hr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729913AbfLCWvi (ORCPT ); Tue, 3 Dec 2019 17:51:38 -0500 X-Greylist: delayed 368 seconds by postgrey-1.27 at vger.kernel.org; Tue, 03 Dec 2019 17:51:37 EST X-Virus-Scanned: Debian amavisd-new at valentin-vidic.from.hr Received: by valentin-vidic.from.hr (Postfix, from userid 1000) id 30A4B239; Tue, 3 Dec 2019 23:45:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=valentin-vidic.from.hr; s=2017; t=1575413122; bh=pW9/x/Zaa3RBLFywltpoZxMRWGFuvmhPgETDh4Fc5RA=; h=From:To:Cc:Subject:Date:From; b=IboLnfXAwYBH5cDl563Z2p5sUk3zV8gtKgyIx/XyP86yTJ2r3n79OTDACpt5Eis1+ BcK+IDjy82l6MgnAupVWz3UcXYSnEGXouP3E5jEmlwISUFL9yLAPJGTmVB3sTqSlgX TQ4TrXqInWPMqIjejWn4MQea7aBs2cYhCYpkG1A4xoaVav2+pcb7e50BGATudGcSZY J3mYfEEQiRX/Rc57jvKXturlpqbDFohMPjbZhNUVsyd59TqroBUQcTS2Ni48zW9JDi ZviYxGuIOKP8IPfkF9f7ANI44vSDADmp7E4I2eDUa5aN6uCTYV1iA/xvvjXoTpYO7p zYMWszZNzrsKA== From: Valentin Vidic To: Boris Pismenny , Aviad Yehezkel , John Fastabend , Daniel Borkmann , Jakub Kicinski Cc: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Valentin Vidic Subject: [PATCH] net/tls: Fix return values for setsockopt Date: Tue, 3 Dec 2019 23:44:58 +0100 Message-Id: <20191203224458.24338-1-vvidic@valentin-vidic.from.hr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ENOTSUPP is not available in userspace: setsockopt failed, 524, Unknown error 524 Signed-off-by: Valentin Vidic --- net/tls/tls_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index bdca31ffe6da..5830b8e02a36 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -496,7 +496,7 @@ static int do_tls_setsockopt_conf(struct sock *sk, char __user *optval, /* check version */ if (crypto_info->version != TLS_1_2_VERSION && crypto_info->version != TLS_1_3_VERSION) { - rc = -ENOTSUPP; + rc = -EINVAL; goto err_crypto_info; } @@ -723,7 +723,7 @@ static int tls_init(struct sock *sk) * share the ulp context. */ if (sk->sk_state != TCP_ESTABLISHED) - return -ENOTSUPP; + return -ENOTCONN; /* allocate tls context */ write_lock_bh(&sk->sk_callback_lock);