From: Chris Wright Date: Thu, 12 Jan 2006 23:46:39 +0000 (-0800) Subject: Add moxa capability fix from security@kernel.org X-Git-Tag: v2.6.14.7~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1e11594ec135e7fcf9f0e6c18eabd690b382b3d;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..46a0a4e02c7 --- /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 +Date: 1136817328 -0500 + +This requires the proper capabilities for the moxa bios update ioctl's. + +Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +--- + + 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 a1cc40c4ff8..362c483b70d 100644 --- 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