Received: by 10.223.185.116 with SMTP id b49csp1079695wrg; Fri, 23 Feb 2018 11:33:03 -0800 (PST) X-Google-Smtp-Source: AH8x226FodjMVPHRRjLGfl8K3FDnG/2e1sVKhwyDDrnTud0bFILMWCIDYfahPPDjeqTQVPZCFdeP X-Received: by 2002:a17:902:76c4:: with SMTP id j4-v6mr2743919plt.410.1519414383363; Fri, 23 Feb 2018 11:33:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519414383; cv=none; d=google.com; s=arc-20160816; b=ehc9EwaegxtDBp2wqbwPGzU2swWGshEoqyYovGcqnrpLubNtgCasVZjKS45qN1ujTl EvXMIxyUz0huKxBsnWVmDAUPmLAWvHGaLAAyIBw5o3C4zLybqK7L4/nML1O2yWCg1puu f7MpR3QPAGTgzNGd14Q5mNWouP8nQOeI0zSYatnp7EKsvSseo/SuLJG/uyZKjT07VxIy n3ZERALhhWVoD3227pBwFi+jfuZa0f3XL4NL9tS7bDzRcQp3ZhY+8iNKdrFL81Yu/VMM roGtyhayQ4Jib+WFvRH7kVGegUv2ii/lfg0ORDxIAzcakxYNoJXHVN0JAsOwHeukl7o5 5eDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=S8+Wh5aH7y9M7GoDrOcxU6eRJpj1UrMU0MMrmCHIB6g=; b=F8IGE57R6EQRWyoID1kCvh+9sdkAnTiAZ2l8WfTl6JObaH5XtoSgS1iwnytm7+JCH5 V+znI1Cmgv1JojojjBd+j1Zi8QqO78U7Nh+THceFIVlC6xMdTmBIzthrbg0VxIlMSqBE TosUgDqP50ASHPujXlzb6Xn3E/dZWdJRcUkZ1QO4brNKuNZ+sb4JUQBVrvLi1gsMCgVb i9VdQLS03raydSWdOV8j0K6xtU/r/rAUpGz6FtqX1VR351YrYL0fPKrz1I4OoeicMIhs c7xIfx1cAw6tI9aQE1lGOvzvydaFOnMjoBKYH4uXmuH3E4IY9XAKCgx/yg4ts4GRXdkI g/fQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6-v6si2190471pla.333.2018.02.23.11.32.49; Fri, 23 Feb 2018 11:33:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754764AbeBWTcJ (ORCPT + 99 others); Fri, 23 Feb 2018 14:32:09 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:46002 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934943AbeBWSvV (ORCPT ); Fri, 23 Feb 2018 13:51:21 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 7A85312E2; Fri, 23 Feb 2018 18:51:20 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Petr Vandrovec , Paolo Abeni , "David S. Miller" Subject: [PATCH 4.14 049/159] dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock Date: Fri, 23 Feb 2018 19:25:57 +0100 Message-Id: <20180223170749.466432856@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni commit dfec091439bb2acf763497cfc58f2bdfc67c56b7 upstream. After commit 3f34cfae1238 ("netfilter: on sockopt() acquire sock lock only in the required scope"), the caller of nf_{get/set}sockopt() must not hold any lock, but, in such changeset, I forgot to cope with DECnet. This commit addresses the issue moving the nf call outside the lock, in the dn_{get,set}sockopt() with the same schema currently used by ipv4 and ipv6. Also moves the unhandled sockopts of the end of the main switch statements, to improve code readability. Reported-by: Petr Vandrovec BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=198791#c2 Fixes: 3f34cfae1238 ("netfilter: on sockopt() acquire sock lock only in the required scope") Signed-off-by: Paolo Abeni Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/decnet/af_decnet.c | 62 ++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-) --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -1339,6 +1339,12 @@ static int dn_setsockopt(struct socket * lock_sock(sk); err = __dn_setsockopt(sock, level, optname, optval, optlen, 0); release_sock(sk); +#ifdef CONFIG_NETFILTER + /* we need to exclude all possible ENOPROTOOPTs except default case */ + if (err == -ENOPROTOOPT && optname != DSO_LINKINFO && + optname != DSO_STREAM && optname != DSO_SEQPACKET) + err = nf_setsockopt(sk, PF_DECnet, optname, optval, optlen); +#endif return err; } @@ -1446,15 +1452,6 @@ static int __dn_setsockopt(struct socket dn_nsp_send_disc(sk, 0x38, 0, sk->sk_allocation); break; - default: -#ifdef CONFIG_NETFILTER - return nf_setsockopt(sk, PF_DECnet, optname, optval, optlen); -#endif - case DSO_LINKINFO: - case DSO_STREAM: - case DSO_SEQPACKET: - return -ENOPROTOOPT; - case DSO_MAXWINDOW: if (optlen != sizeof(unsigned long)) return -EINVAL; @@ -1502,6 +1499,12 @@ static int __dn_setsockopt(struct socket return -EINVAL; scp->info_loc = u.info; break; + + case DSO_LINKINFO: + case DSO_STREAM: + case DSO_SEQPACKET: + default: + return -ENOPROTOOPT; } return 0; @@ -1515,6 +1518,20 @@ static int dn_getsockopt(struct socket * lock_sock(sk); err = __dn_getsockopt(sock, level, optname, optval, optlen, 0); release_sock(sk); +#ifdef CONFIG_NETFILTER + if (err == -ENOPROTOOPT && optname != DSO_STREAM && + optname != DSO_SEQPACKET && optname != DSO_CONACCEPT && + optname != DSO_CONREJECT) { + int len; + + if (get_user(len, optlen)) + return -EFAULT; + + err = nf_getsockopt(sk, PF_DECnet, optname, optval, &len); + if (err >= 0) + err = put_user(len, optlen); + } +#endif return err; } @@ -1580,26 +1597,6 @@ static int __dn_getsockopt(struct socket r_data = &link; break; - default: -#ifdef CONFIG_NETFILTER - { - int ret, len; - - if (get_user(len, optlen)) - return -EFAULT; - - ret = nf_getsockopt(sk, PF_DECnet, optname, optval, &len); - if (ret >= 0) - ret = put_user(len, optlen); - return ret; - } -#endif - case DSO_STREAM: - case DSO_SEQPACKET: - case DSO_CONACCEPT: - case DSO_CONREJECT: - return -ENOPROTOOPT; - case DSO_MAXWINDOW: if (r_len > sizeof(unsigned long)) r_len = sizeof(unsigned long); @@ -1631,6 +1628,13 @@ static int __dn_getsockopt(struct socket r_len = sizeof(unsigned char); r_data = &scp->info_rem; break; + + case DSO_STREAM: + case DSO_SEQPACKET: + case DSO_CONACCEPT: + case DSO_CONREJECT: + default: + return -ENOPROTOOPT; } if (r_data) {