Add moxa capability fix from security@kernel.org

diff --git a/queue/moxa-serial-add-proper-capability-check.patch b/queue/moxa-serial-add-proper-capability-check.patch
new file mode 100644 (file)
index 0000000..46a0a4e
--- /dev/null
+++ b/queue/moxa-serial-add-proper-capability-check.patch
@@ -0,0 +1,26 @@
+From nobody Mon Sep 17 00:00:00 2001
+Subject: [PATCH] moxa serial: add proper capability check
+From: Alan Cox <alan@redhat.com>
+Date: 1136817328 -0500
+
+This requires the proper capabilities for the moxa bios update ioctl's.
+
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/char/moxa.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
+--- a/drivers/char/moxa.c
++++ b/drivers/char/moxa.c
+@@ -1649,6 +1649,8 @@ int MoxaDriverIoctl(unsigned int cmd, un
+       case MOXA_FIND_BOARD:
+       case MOXA_LOAD_C320B:
+       case MOXA_LOAD_CODE:
++              if (!capable(CAP_SYS_RAWIO))
++                      return -EPERM;
+               break;
+       }
+ 

diff --git a/queue/series b/queue/series
index a1cc40c4ff83e4e343e552ef734ad806d0c7f43c..362c483b70d85b4152276b018276ac2ada90f2ad 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -12,3 +12,4 @@ fix-bridge-netfilter-matching-ip-fragments.patch
 sparc64-fix-ptrace.patch
 sparc64-fix-sys_fstat64-entry-in-64-bit-syscall-table.patch
 fix-DoS-in-netlink_rcv_skb.patch
+moxa-serial-add-proper-capability-check.patch