[PATCH][MIPS] add return value check to user_termio_to_kernel_termios()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>

diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/include/asm/termios.h linux/arch/mips/include/asm/termios.h
--- linux-orig/arch/mips/include/asm/termios.h	2008-10-19 22:33:14.114377349 +0900
+++ linux/arch/mips/include/asm/termios.h	2008-10-19 22:41:25.322369698 +0900
@@ -97,14 +97,14 @@ struct termio {
 #define user_termio_to_kernel_termios(termios, termio) \
 ({ \
 	unsigned short tmp; \
-	get_user(tmp, &(termio)->c_iflag); \
-	(termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
-	get_user(tmp, &(termio)->c_oflag); \
-	(termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
-	get_user(tmp, &(termio)->c_cflag); \
-	(termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
-	get_user(tmp, &(termio)->c_lflag); \
-	(termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
+	if (!get_user(tmp, &(termio)->c_iflag)) \
+		(termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
+	if (!get_user(tmp, &(termio)->c_oflag)) \
+		(termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
+	if (!get_user(tmp, &(termio)->c_cflag)) \
+		(termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
+	if (!get_user(tmp, &(termio)->c_lflag)) \
+		(termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
 	get_user((termios)->c_line, &(termio)->c_line); \
 	copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
 })


[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux