Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6325179 authored by Gleb Fotengauer-Malinovskiy's avatar Gleb Fotengauer-Malinovskiy Committed by Greg Kroah-Hartman
Browse files

tty: Fix TIOCGPTPEER ioctl definition 



This ioctl does nothing to justify an _IOC_READ or _IOC_WRITE flag
because it doesn't copy anything from/to userspace to access the
argument.

Fixes: 54ebbfb1 ("tty: add TIOCGPTPEER ioctl")
Signed-off-by: default avatarGleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Acked-by: default avatarAleksa Sarai <asarai@suse.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6509f309

arch/alpha/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454

arch/mips/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



/* I hope the range from 0x5480 on is free ... */

#define TIOCSCTTY	0x5480		/* become controlling tty */

arch/parisc/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define FIONCLEX	0x5450  /* these numbers need to be adjusted. */

#define FIOCLEX		0x5451

arch/powerpc/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454

arch/sh/include/uapi/asm/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCGPTPEER	_IOR('T', 0x41, int) /* Safely open the slave */

#define TIOCGPTPEER	_IO('T', 0x41) /* Safely open the slave */



#define TIOCSERCONFIG	_IO('T', 83) /* 0x5453 */

#define TIOCSERGWILD	_IOR('T', 84,  int) /* 0x5454 */