From patchwork Thu Aug 8 19:05:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 170828 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp8982603ile; Thu, 8 Aug 2019 12:09:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPGBHiXFTV1LgzFZdwM4JZ5eVU4eosPKXFTAgxq9peG3XVMt3CET9L7nlnTof6nVdHlq8Y X-Received: by 2002:aa7:9713:: with SMTP id a19mr17117265pfg.64.1565291391522; Thu, 08 Aug 2019 12:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565291391; cv=none; d=google.com; s=arc-20160816; b=sqK5D62eYGc/gbOi9XkrbTyzJjtk3BaGFOAFa67F89YQ8tbHgI+TNJmxyp/WjVG48b 0fyV/ftPhJ6qNHmkUWizHk3jHQv8PKVbQFIo/mg4vj2bCyFWDAj5EXTtsmNgfkHlWjq7 j8y6I31LxcNSmjUMQxx+kPS9wRdAOWFvHpNtPNbBP7smAJY4siMKSLbmkldmazbtLspg r0RzEXRyktoOfEdtHpS+6ekmXk9VRrJvgoptb4vtLQN4ItxNOiDVySURlNB3wl0OthPu Oq95c7/AC25tHts7kTVI1UFQdujN3EOKZrlW6O4x9Qu3GvZ72Fiy2Mvhug+/Mzr8lByt sOSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6bn3xwMkpHNac4jKKsAK8/p6CjNLmqUFhgm0E/Pad04=; b=GGhpD4hTX9CW3Pqe9rP4j/EibgeR0vkWuQ4gOXW89MNLwNwXMa9nmTwItz8REDrpUT bCFGRUgp+Ap30T6Lc7n87ankPa45vk95YXdIZaMDgt+GCMio2fYEnFhsmqY4ZrGWeef4 jv3DHaSKcKtLFT9rO+D/2DfcmzpOntQezRcMQ9vKvBk2u/lXBQyvMONp48TS7RS4y7D4 SuCW49oJjwwcI118IWpl3UuEt+hg7DzbecfG9ZzJABT+ylHj5df0e5qPV/C9L2GKIw5U /FcQVs0KKwBI91Q3dR4GNlNo6oF4LMS06HspvsskcIYAZy9jBDZsixvdKevT9BkDXA+k DY3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BPhVQ9uN; 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 f1si5225404pld.12.2019.08.08.12.09.51; Thu, 08 Aug 2019 12:09:51 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=BPhVQ9uN; 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 S2405179AbfHHTJu (ORCPT + 28 others); Thu, 8 Aug 2019 15:09:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:44084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405158AbfHHTJq (ORCPT ); Thu, 8 Aug 2019 15:09:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0D0012173E; Thu, 8 Aug 2019 19:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565291385; bh=wXX6c7v6ufyv8qeaTgGQyaBp4jZNRtKWBLXZWn0+ffU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BPhVQ9uN62LdH8zVTgC4bqQwNlF9HHN23LujqBFU6w4Xpq8sviW0NnkpL+kwXpT5l 8DYNPA4VjmP4yveW7eiEpoOs+be4iYVGa4LSswqlAWhvBSwj7d6oc+h2RuuecbhgA/ 5epw8kZy9Exx/1xBCvsuUWt8BKW0xmMFumSOd1vA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guillaume Nault , Arnd Bergmann , "David S. Miller" Subject: [PATCH 4.19 39/45] compat_ioctl: pppoe: fix PPPOEIOCSFWD handling Date: Thu, 8 Aug 2019 21:05:25 +0200 Message-Id: <20190808190456.059378702@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190808190453.827571908@linuxfoundation.org> References: <20190808190453.827571908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 055d88242a6046a1ceac3167290f054c72571cd9 ] Support for handling the PPPOEIOCSFWD ioctl in compat mode was added in linux-2.5.69 along with hundreds of other commands, but was always broken sincen only the structure is compatible, but the command number is not, due to the size being sizeof(size_t), or at first sizeof(sizeof((struct sockaddr_pppox)), which is different on 64-bit architectures. Guillaume Nault adds: And the implementation was broken until 2016 (see 29e73269aa4d ("pppoe: fix reference counting in PPPoE proxy")), and nobody ever noticed. I should probably have removed this ioctl entirely instead of fixing it. Clearly, it has never been used. Fix it by adding a compat_ioctl handler for all pppoe variants that translates the command number and then calls the regular ioctl function. All other ioctl commands handled by pppoe are compatible between 32-bit and 64-bit, and require compat_ptr() conversion. This should apply to all stable kernels. Acked-by: Guillaume Nault Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ppp/pppoe.c | 3 +++ drivers/net/ppp/pppox.c | 13 +++++++++++++ drivers/net/ppp/pptp.c | 3 +++ fs/compat_ioctl.c | 3 --- include/linux/if_pppox.h | 3 +++ net/l2tp/l2tp_ppp.c | 3 +++ 6 files changed, 25 insertions(+), 3 deletions(-) --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -1120,6 +1120,9 @@ static const struct proto_ops pppoe_ops .recvmsg = pppoe_recvmsg, .mmap = sock_no_mmap, .ioctl = pppox_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = pppox_compat_ioctl, +#endif }; static const struct pppox_proto pppoe_proto = { --- a/drivers/net/ppp/pppox.c +++ b/drivers/net/ppp/pppox.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +104,18 @@ int pppox_ioctl(struct socket *sock, uns EXPORT_SYMBOL(pppox_ioctl); +#ifdef CONFIG_COMPAT +int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) +{ + if (cmd == PPPOEIOCSFWD32) + cmd = PPPOEIOCSFWD; + + return pppox_ioctl(sock, cmd, (unsigned long)compat_ptr(arg)); +} + +EXPORT_SYMBOL(pppox_compat_ioctl); +#endif + static int pppox_create(struct net *net, struct socket *sock, int protocol, int kern) { --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -633,6 +633,9 @@ static const struct proto_ops pptp_ops = .recvmsg = sock_no_recvmsg, .mmap = sock_no_mmap, .ioctl = pppox_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = pppox_compat_ioctl, +#endif }; static const struct pppox_proto pppox_pptp_proto = { --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -894,9 +894,6 @@ COMPATIBLE_IOCTL(PPPIOCDISCONN) COMPATIBLE_IOCTL(PPPIOCATTCHAN) COMPATIBLE_IOCTL(PPPIOCGCHAN) COMPATIBLE_IOCTL(PPPIOCGL2TPSTATS) -/* PPPOX */ -COMPATIBLE_IOCTL(PPPOEIOCSFWD) -COMPATIBLE_IOCTL(PPPOEIOCDFWD) /* Big A */ /* sparc only */ /* Big Q for sound/OSS */ --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -84,6 +84,9 @@ extern int register_pppox_proto(int prot extern void unregister_pppox_proto(int proto_num); extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */ extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); +extern int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); + +#define PPPOEIOCSFWD32 _IOW(0xB1 ,0, compat_size_t) /* PPPoX socket states */ enum { --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1686,6 +1686,9 @@ static const struct proto_ops pppol2tp_o .recvmsg = pppol2tp_recvmsg, .mmap = sock_no_mmap, .ioctl = pppox_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = pppox_compat_ioctl, +#endif }; static const struct pppox_proto pppol2tp_proto = {