[v5,11/18] tty: handle compat PPP ioctls
diff mbox series

Message ID 20190814205521.122180-2-arnd@arndb.de
State New
Headers show
Series
  • compat_ioctl.c removal, part 2/3
Related show

Commit Message

Arnd Bergmann Aug. 14, 2019, 8:54 p.m. UTC
Multiple tty devices are have tty devices that handle the
PPPIOCGUNIT and PPPIOCGCHAN ioctls. To avoid adding a compat_ioctl
handler to each of those, add it directly in tty_compat_ioctl
so we can remove the calls from fs/compat_ioctl.c.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/tty/tty_io.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Greg Kroah-Hartman Aug. 15, 2019, 2:09 p.m. UTC | #1
On Wed, Aug 14, 2019 at 10:54:46PM +0200, Arnd Bergmann wrote:
> Multiple tty devices are have tty devices that handle the
> PPPIOCGUNIT and PPPIOCGCHAN ioctls. To avoid adding a compat_ioctl
> handler to each of those, add it directly in tty_compat_ioctl
> so we can remove the calls from fs/compat_ioctl.c.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Patch
diff mbox series

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index cee8b69c6f72..bf5241e0d772 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -87,6 +87,7 @@ 
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -2811,6 +2812,9 @@  static long tty_compat_ioctl(struct file *file, unsigned int cmd,
 #endif
 	case TIOCGSOFTCAR:
 	case TIOCSSOFTCAR:
+
+	case PPPIOCGCHAN:
+	case PPPIOCGUNIT:
 		return tty_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
 	case TIOCCONS:
 	case TIOCEXCL: