The patch titled
SELinux: update USB code with new kill_proc_info_as_uid
has been added to the -mm tree. Its filename is
selinux-update-usb-code-with-new-kill_proc_info_as_uid.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: SELinux: update USB code with new kill_proc_info_as_uid
From: David Quigley <dpquigl@xxxxxxxxxxxxx>
This patch updates the USB core to save and pass the sending task secid when
sending signals upon AIO completion so that proper security checking can be
applied by security modules.
Signed-off-by: David Quigley <dpquigl@xxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
Cc: Stephen Smalley <sds@xxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/core/devio.c | 6 +++++-
drivers/usb/core/inode.c | 2 +-
drivers/usb/core/usb.h | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/usb/core/devio.c~selinux-update-usb-code-with-new-kill_proc_info_as_uid drivers/usb/core/devio.c
--- a/drivers/usb/core/devio.c~selinux-update-usb-code-with-new-kill_proc_info_as_uid
+++ a/drivers/usb/core/devio.c
@@ -47,6 +47,7 @@
#include <linux/usbdevice_fs.h>
#include <linux/cdev.h>
#include <linux/notifier.h>
+#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
#include <linux/moduleparam.h>
@@ -68,6 +69,7 @@ struct async {
void __user *userbuffer;
void __user *userurb;
struct urb *urb;
+ u32 secid;
};
static int usbfs_snoop = 0;
@@ -312,7 +314,7 @@ static void async_completed(struct urb *
sinfo.si_code = SI_ASYNCIO;
sinfo.si_addr = as->userurb;
kill_proc_info_as_uid(as->signr, &sinfo, as->pid, as->uid,
- as->euid);
+ as->euid, as->secid);
}
snoop(&urb->dev->dev, "urb complete\n");
snoop_urb(urb, as->userurb);
@@ -572,6 +574,7 @@ static int usbdev_open(struct inode *ino
ps->disc_euid = current->euid;
ps->disccontext = NULL;
ps->ifclaimed = 0;
+ security_task_getsecid(current, &ps->secid);
wmb();
list_add_tail(&ps->list, &dev->filelist);
file->private_data = ps;
@@ -1053,6 +1056,7 @@ static int proc_do_submiturb(struct dev_
as->pid = current->pid;
as->uid = current->uid;
as->euid = current->euid;
+ security_task_getsecid(current, &as->secid);
if (!(uurb->endpoint & USB_DIR_IN)) {
if (copy_from_user(as->urb->transfer_buffer, uurb->buffer, as->urb->transfer_buffer_length)) {
free_async(as);
diff -puN drivers/usb/core/inode.c~selinux-update-usb-code-with-new-kill_proc_info_as_uid drivers/usb/core/inode.c
--- a/drivers/usb/core/inode.c~selinux-update-usb-code-with-new-kill_proc_info_as_uid
+++ a/drivers/usb/core/inode.c
@@ -700,7 +700,7 @@ static void usbfs_remove_device(struct u
sinfo.si_errno = EPIPE;
sinfo.si_code = SI_ASYNCIO;
sinfo.si_addr = ds->disccontext;
- kill_proc_info_as_uid(ds->discsignr, &sinfo, ds->disc_pid, ds->disc_uid, ds->disc_euid);
+ kill_proc_info_as_uid(ds->discsignr, &sinfo, ds->disc_pid, ds->disc_uid, ds->disc_euid, ds->secid);
}
}
}
diff -puN drivers/usb/core/usb.h~selinux-update-usb-code-with-new-kill_proc_info_as_uid drivers/usb/core/usb.h
--- a/drivers/usb/core/usb.h~selinux-update-usb-code-with-new-kill_proc_info_as_uid
+++ a/drivers/usb/core/usb.h
@@ -80,6 +80,7 @@ struct dev_state {
uid_t disc_uid, disc_euid;
void __user *disccontext;
unsigned long ifclaimed;
+ u32 secid;
};
/* internal notify stuff */
_
Patches currently in -mm which might be from dpquigl@xxxxxxxxxxxxx are
origin.patch
selinux-extend-task_kill-hook-to-handle-signals-sent.patch
selinux-add-security-hook-call-to-kill_proc_info_as_uid.patch
selinux-update-usb-code-with-new-kill_proc_info_as_uid.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
