From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Eric W. Biederman" <ebiederm@aristanetworks.com>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Kay Sievers <kay.sievers@vrfy.org>,
Andrew Morton <akpm@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 48/61] sysfs: don't block indefinitely for unmapped files.
Date: Tue, 24 Mar 2009 17:26:52 -0700 [thread overview]
Message-ID: <1237940825-22904-48-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20090325001659.GA22461@kroah.com>
From: Eric W. Biederman <ebiederm@aristanetworks.com>
Modify sysfs bin files so that we can remove the bin file while they are
still mapped. When the kobject is removed we unmap the bin file and
arrange for future accesses to the mapping to receive SIGBUS.
Implementing this prevents a nasty DOS when pci devices are hot plugged
and unplugged. Where if any of their resources were mmaped the kernel
could not free up their pci resources or release their pci data
structures.
[akpm@linux-foundation.org: remove unused var]
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/sysfs/bin.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++----
fs/sysfs/dir.c | 1 +
fs/sysfs/sysfs.h | 2 +
3 files changed, 174 insertions(+), 13 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index f2c478c..96cc2bf 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -21,15 +21,28 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/mutex.h>
+#include <linux/mm.h>
#include <asm/uaccess.h>
#include "sysfs.h"
+/*
+ * There's one bin_buffer for each open file.
+ *
+ * filp->private_data points to bin_buffer and
+ * sysfs_dirent->s_bin_attr.buffers points to a the bin_buffer s
+ * sysfs_dirent->s_bin_attr.buffers is protected by sysfs_bin_lock
+ */
+static DEFINE_MUTEX(sysfs_bin_lock);
+
struct bin_buffer {
- struct mutex mutex;
- void *buffer;
- int mmapped;
+ struct mutex mutex;
+ void *buffer;
+ int mmapped;
+ struct vm_operations_struct *vm_ops;
+ struct file *file;
+ struct hlist_node list;
};
static int
@@ -168,29 +181,148 @@ out_free:
return count;
}
+static void bin_vma_open(struct vm_area_struct *vma)
+{
+ struct file *file = vma->vm_file;
+ struct bin_buffer *bb = file->private_data;
+ struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
+
+ if (!bb->vm_ops || !bb->vm_ops->open)
+ return;
+
+ if (!sysfs_get_active_two(attr_sd))
+ return;
+
+ bb->vm_ops->open(vma);
+
+ sysfs_put_active_two(attr_sd);
+}
+
+static void bin_vma_close(struct vm_area_struct *vma)
+{
+ struct file *file = vma->vm_file;
+ struct bin_buffer *bb = file->private_data;
+ struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
+
+ if (!bb->vm_ops || !bb->vm_ops->close)
+ return;
+
+ if (!sysfs_get_active_two(attr_sd))
+ return;
+
+ bb->vm_ops->close(vma);
+
+ sysfs_put_active_two(attr_sd);
+}
+
+static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+ struct file *file = vma->vm_file;
+ struct bin_buffer *bb = file->private_data;
+ struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
+ int ret;
+
+ if (!bb->vm_ops || !bb->vm_ops->fault)
+ return VM_FAULT_SIGBUS;
+
+ if (!sysfs_get_active_two(attr_sd))
+ return VM_FAULT_SIGBUS;
+
+ ret = bb->vm_ops->fault(vma, vmf);
+
+ sysfs_put_active_two(attr_sd);
+ return ret;
+}
+
+static int bin_page_mkwrite(struct vm_area_struct *vma, struct page *page)
+{
+ struct file *file = vma->vm_file;
+ struct bin_buffer *bb = file->private_data;
+ struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
+ int ret;
+
+ if (!bb->vm_ops || !bb->vm_ops->page_mkwrite)
+ return -EINVAL;
+
+ if (!sysfs_get_active_two(attr_sd))
+ return -EINVAL;
+
+ ret = bb->vm_ops->page_mkwrite(vma, page);
+
+ sysfs_put_active_two(attr_sd);
+ return ret;
+}
+
+static int bin_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write)
+{
+ struct file *file = vma->vm_file;
+ struct bin_buffer *bb = file->private_data;
+ struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
+ int ret;
+
+ if (!bb->vm_ops || !bb->vm_ops->access)
+ return -EINVAL;
+
+ if (!sysfs_get_active_two(attr_sd))
+ return -EINVAL;
+
+ ret = bb->vm_ops->access(vma, addr, buf, len, write);
+
+ sysfs_put_active_two(attr_sd);
+ return ret;
+}
+
+static struct vm_operations_struct bin_vm_ops = {
+ .open = bin_vma_open,
+ .close = bin_vma_close,
+ .fault = bin_fault,
+ .page_mkwrite = bin_page_mkwrite,
+ .access = bin_access,
+};
+
static int mmap(struct file *file, struct vm_area_struct *vma)
{
struct bin_buffer *bb = file->private_data;
struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
struct bin_attribute *attr = attr_sd->s_bin_attr.bin_attr;
struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
+ struct vm_operations_struct *vm_ops;
int rc;
mutex_lock(&bb->mutex);
/* need attr_sd for attr, its parent for kobj */
+ rc = -ENODEV;
if (!sysfs_get_active_two(attr_sd))
- return -ENODEV;
+ goto out_unlock;
rc = -EINVAL;
- if (attr->mmap)
- rc = attr->mmap(kobj, attr, vma);
+ if (!attr->mmap)
+ goto out_put;
- if (rc == 0 && !bb->mmapped)
- bb->mmapped = 1;
- else
- sysfs_put_active_two(attr_sd);
+ rc = attr->mmap(kobj, attr, vma);
+ vm_ops = vma->vm_ops;
+ vma->vm_ops = &bin_vm_ops;
+ if (rc)
+ goto out_put;
+ rc = -EINVAL;
+ if (bb->mmapped && bb->vm_ops != vma->vm_ops)
+ goto out_put;
+
+#ifdef CONFIG_NUMA
+ rc = -EINVAL;
+ if (vm_ops && ((vm_ops->set_policy || vm_ops->get_policy || vm_ops->migrate)))
+ goto out_put;
+#endif
+
+ rc = 0;
+ bb->mmapped = 1;
+ bb->vm_ops = vm_ops;
+out_put:
+ sysfs_put_active_two(attr_sd);
+out_unlock:
mutex_unlock(&bb->mutex);
return rc;
@@ -223,8 +355,13 @@ static int open(struct inode * inode, struct file * file)
goto err_out;
mutex_init(&bb->mutex);
+ bb->file = file;
file->private_data = bb;
+ mutex_lock(&sysfs_bin_lock);
+ hlist_add_head(&bb->list, &attr_sd->s_bin_attr.buffers);
+ mutex_unlock(&sysfs_bin_lock);
+
/* open succeeded, put active references */
sysfs_put_active_two(attr_sd);
return 0;
@@ -237,11 +374,12 @@ static int open(struct inode * inode, struct file * file)
static int release(struct inode * inode, struct file * file)
{
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
struct bin_buffer *bb = file->private_data;
- if (bb->mmapped)
- sysfs_put_active_two(attr_sd);
+ mutex_lock(&sysfs_bin_lock);
+ hlist_del(&bb->list);
+ mutex_unlock(&sysfs_bin_lock);
+
kfree(bb->buffer);
kfree(bb);
return 0;
@@ -256,6 +394,26 @@ const struct file_operations bin_fops = {
.release = release,
};
+
+void unmap_bin_file(struct sysfs_dirent *attr_sd)
+{
+ struct bin_buffer *bb;
+ struct hlist_node *tmp;
+
+ if (sysfs_type(attr_sd) != SYSFS_KOBJ_BIN_ATTR)
+ return;
+
+ mutex_lock(&sysfs_bin_lock);
+
+ hlist_for_each_entry(bb, tmp, &attr_sd->s_bin_attr.buffers, list) {
+ struct inode *inode = bb->file->f_path.dentry->d_inode;
+
+ unmap_mapping_range(inode->i_mapping, 0, 0, 1);
+ }
+
+ mutex_unlock(&sysfs_bin_lock);
+}
+
/**
* sysfs_create_bin_file - create binary file for object.
* @kobj: object.
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index f13d852..66aeb4f 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -609,6 +609,7 @@ void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
sysfs_drop_dentry(sd);
sysfs_deactivate(sd);
+ unmap_bin_file(sd);
sysfs_put(sd);
}
}
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 9055d04..3fa0d98 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -28,6 +28,7 @@ struct sysfs_elem_attr {
struct sysfs_elem_bin_attr {
struct bin_attribute *bin_attr;
+ struct hlist_head buffers;
};
/*
@@ -164,6 +165,7 @@ int sysfs_add_file_mode(struct sysfs_dirent *dir_sd,
* bin.c
*/
extern const struct file_operations bin_fops;
+void unmap_bin_file(struct sysfs_dirent *attr_sd);
/*
* symlink.c
--
1.6.2
next prev parent reply other threads:[~2009-03-25 0:47 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-25 0:16 [GIT PATCH] driver core patches for 2.6.30 merge window Greg KH
2009-03-25 0:26 ` [PATCH 01/61] edac: struct device - replace bus_id with dev_name(), dev_set_name() Greg Kroah-Hartman
[not found] ` <20090325001659.GA22461-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2009-03-25 0:26 ` [PATCH 02/61] spi: " Greg Kroah-Hartman
2009-03-25 0:26 ` Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 03/61] video: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 04/61] zorro: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 05/61] mmc: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 06/61] mtd: " Greg Kroah-Hartman
2009-03-25 0:26 ` Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 07/61] pci: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 08/61] rapidio: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 09/61] s390: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 10/61] serial: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 11/61] sh: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 12/61] tc: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 13/61] pcmcia: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 14/61] rtc: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 15/61] net: " Greg Kroah-Hartman
2009-03-25 3:31 ` Stephen Hemminger
2009-03-25 4:18 ` Greg KH
2009-03-25 6:29 ` David Miller
2009-03-25 9:34 ` Kay Sievers
2009-03-25 9:34 ` Kay Sievers
2009-03-25 0:26 ` [PATCH 16/61] drm: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 17/61] v4l: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 18/61] amba: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 19/61] dio: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 20/61] dma: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 21/61] eisa: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 22/61] gpio: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 23/61] mca: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 24/61] mfd: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 25/61] wimax: " Greg Kroah-Hartman
2009-03-25 1:22 ` Perez-Gonzalez, Inaky
2009-03-25 0:26 ` [PATCH 26/61] usb: " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 27/61] PS3: replace bus_id usage Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 28/61] USB: FHCI: use dev_name() in place of bus_id Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 29/61] driver core: get rid of struct device's bus_id string array Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 30/61] SYSFS: use standard magic.h for sysfs Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 31/61] sysfs: Take sysfs_mutex when fetching the root inode Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 32/61] driver core: check bus->match without holding device lock Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 33/61] platform: make better use of to_platform_{device,driver}() macros Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 34/61] platform: introduce module id table for platform devices Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 35/61] UIO: Add name attributes for mappings and port regions Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 36/61] uio: add the uio_aec driver Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 37/61] UIO: Take offset into account when determining number of pages that can be mapped Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 38/61] platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 39/61] scsi/m68k: Kill NCR_700_detect() warnings Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 40/61] driver-core: do not register a driver with bus_type not registered Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 41/61] sysfs: sysfs_add_one WARNs with full path to duplicate filename Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 42/61] sysfs: reference sysfs_dirent from sysfs inodes Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 43/61] driver core: remove polling for driver_probe_done(v5) Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 44/61] driver core: create a private portion of struct device Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 45/61] driver core: move klist_children into private structure Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 46/61] driver core: move knode_driver " Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 47/61] driver core: move knode_bus " Greg Kroah-Hartman
2009-03-25 0:26 ` Greg Kroah-Hartman [this message]
2009-03-25 0:26 ` [PATCH 49/61] driver core: move platform_data into platform_device Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 50/61] driver core: fix passing platform_data Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 51/61] vcs: hook sysfs devices into object lifetime instead of "binding" Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 52/61] Driver core: implement uevent suppress in kobject Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 53/61] Driver core: some cleanup on drivers/base/sys.c Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 54/61] Driver core: Fix device_move() vs. dpm list ordering, v2 Greg Kroah-Hartman
2009-03-25 0:26 ` [PATCH 55/61] sysfs: only allow one scheduled removal callback per kobj Greg Kroah-Hartman
2009-03-25 0:27 ` [PATCH 56/61] kobject: don't block for each kobject_uevent Greg Kroah-Hartman
2009-03-25 0:27 ` [PATCH 57/61] sysfs: fix some bin_vm_ops errors Greg Kroah-Hartman
2009-03-25 0:27 ` [PATCH 58/61] dynamic debug: combine dprintk and dynamic printk Greg Kroah-Hartman
2009-03-25 10:50 ` Ingo Molnar
2009-03-25 13:20 ` Jason Baron
2009-03-25 0:27 ` [PATCH 59/61] dynamic debug: update docs Greg Kroah-Hartman
2009-03-25 0:27 ` [PATCH 60/61] Dynamic debug: allow simple quoting of words Greg Kroah-Hartman
2009-03-25 0:27 ` [PATCH 61/61] Dynamic debug: fix pr_fmt() build error Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1237940825-22904-48-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@aristanetworks.com \
--cc=jbarnes@virtuousgeek.org \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.