patch-2.4.0-test2 linux/drivers/char/vt.c
Next file: linux/drivers/char/wdt.c
Previous file: linux/drivers/char/videodev.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Mon Jun 19 13:25:06 2000
- Orig file:
v2.4.0-test1/linux/drivers/char/vt.c
- Orig date:
Thu May 11 15:30:07 2000
diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/vt.c linux/drivers/char/vt.c
@@ -62,7 +62,7 @@
*/
unsigned char keyboard_type = KB_101;
-#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__)
+#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__) && !defined(__sh__)
asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
#endif
@@ -472,7 +472,7 @@
ucval = keyboard_type;
goto setchar;
-#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__)
+#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__) && !defined(__sh__)
/*
* These cannot be implemented on any machine that implements
* ioperm() in user level (such as Alpha PCs).
@@ -592,6 +592,8 @@
case KDGETKEYCODE:
case KDSETKEYCODE:
+ if(!capable(CAP_SYS_ADMIN))
+ perm=0;
return do_kbkeycode_ioctl(cmd, (struct kbkeycode *)arg, perm);
case KDGKBENT:
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)