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

Commit f8a4c3b5 authored by Dave Miller's avatar Dave Miller Committed by Linus Torvalds
Browse files

tty: fix tty network driver interactions with TCGET/TCSET calls (x86 fix) 



And to go with it Dave's type checking x86 termios headers.  I've updated
these as the original sent by Dave had some wrong types in it.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 94b3e03c

include/asm-x86/termios.h

+45 −29
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ struct termio { 


#ifdef __KERNEL__



#include <asm/uaccess.h>



/*	intr=^C		quit=^\		erase=del	kill=^U

	eof=^D		vtime=\0	vmin=\1		sxtc=\0

	start=^Q	stop=^S		susp=^Z		eol=\0
@@ -58,39 +60,53 @@ struct termio { 
	*(unsigned short *) &(termios)->x = __tmp; \

}



#define user_termio_to_kernel_termios(termios, termio) \

({ \

	SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \

	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \

	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \

	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \

	copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \

})

static inline int user_termio_to_kernel_termios(struct ktermios *termios,

						struct termio __user *termio)

{

	SET_LOW_TERMIOS_BITS(termios, termio, c_iflag);

	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag);

	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag);

	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag);

	return copy_from_user(termios->c_cc, termio->c_cc, NCC);

}



/*

 * Translate a "termios" structure into a "termio". Ugh.

 */

#define kernel_termios_to_user_termio(termio, termios) \

({ \

	put_user((termios)->c_iflag, &(termio)->c_iflag); \

	put_user((termios)->c_oflag, &(termio)->c_oflag); \

	put_user((termios)->c_cflag, &(termio)->c_cflag); \

	put_user((termios)->c_lflag, &(termio)->c_lflag); \

	put_user((termios)->c_line,  &(termio)->c_line); \

	copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \

})



#define user_termios_to_kernel_termios(k, u) \

	copy_from_user(k, u, sizeof(struct termios2))



#define kernel_termios_to_user_termios(u, k) \

	copy_to_user(u, k, sizeof(struct termios2))



#define user_termios_to_kernel_termios_1(k, u) \

	copy_from_user(k, u, sizeof(struct termios))



#define kernel_termios_to_user_termios_1(u, k) \

	copy_to_user(u, k, sizeof(struct termios))

static inline int kernel_termios_to_user_termio(struct termio __user *termio,

					    struct ktermios *termios)

{

	put_user((termios)->c_iflag, &(termio)->c_iflag);

	put_user((termios)->c_oflag, &(termio)->c_oflag);

	put_user((termios)->c_cflag, &(termio)->c_cflag);

	put_user((termios)->c_lflag, &(termio)->c_lflag);

	put_user((termios)->c_line,  &(termio)->c_line);

	return copy_to_user((termio)->c_cc, (termios)->c_cc, NCC);

}



static inline int user_termios_to_kernel_termios(struct ktermios *k,

						 struct termios2 __user *u)

{

	return copy_from_user(k, u, sizeof(struct termios2));

}



static inline int kernel_termios_to_user_termios(struct termios2 __user *u,

						 struct ktermios *k)

{

	return copy_to_user(u, k, sizeof(struct termios2));

}



static inline int user_termios_to_kernel_termios_1(struct ktermios *k,

						   struct termios __user *u)

{

	return copy_from_user(k, u, sizeof(struct termios));

}



static inline int kernel_termios_to_user_termios_1(struct termios __user *u,

						   struct ktermios *k)

{

	return copy_to_user(u, k, sizeof(struct termios));

}



#endif	/* __KERNEL__ */