malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

Browse Source 
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: remove blk_queue_tag_depth() and blk_queue_tag_queue()
  block: remove unused ->busy part of the block queue tag map
  bio: fix __bio_copy_iov() handling of bio->bv_len
  bio: fix bio_copy_kern() handling of bio->bv_len
  block: submit_bh() inadvertently discards barrier flag on a sync write
  block: clean up cmdfilter sysfs interface
  block: rename blk_scsi_cmd_filter to blk_cmd_filter
  sg: restore command permission for TYPE_SCANNER
  block: move cmdfilter from gendisk to request_queue
This commit is contained in:
Linus Torvalds 2008-08-27 13:55:35 -07:00
commit 0559bc8e9b
10 changed files with 224 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-core.c
View File

@ -582,6 +582,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
q->sg_reserved_size = INT_MAX; q->sg_reserved_size = INT_MAX;
blk_set_cmd_filter_defaults(&q->cmd_filter);
/* /*
* all done * all done
*/ */

6
block/blk-tag.c
View File

@ -38,7 +38,8 @@ static int __blk_free_tags(struct blk_queue_tag *bqt)
retval = atomic_dec_and_test(&bqt->refcnt); retval = atomic_dec_and_test(&bqt->refcnt);
if (retval) { if (retval) {
BUG_ON(bqt->busy); BUG_ON(find_first_bit(bqt->tag_map, bqt->max_depth) <
bqt->max_depth);
kfree(bqt->tag_index); kfree(bqt->tag_index);
bqt->tag_index = NULL; bqt->tag_index = NULL;
@ -147,7 +148,6 @@ static struct blk_queue_tag *__blk_queue_init_tags(struct request_queue *q,
if (init_tag_map(q, tags, depth)) if (init_tag_map(q, tags, depth))
goto fail; goto fail;
tags->busy = 0;
atomic_set(&tags->refcnt, 1); atomic_set(&tags->refcnt, 1);
return tags; return tags;
fail: fail:
@ -313,7 +313,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
* unlock memory barrier semantics. * unlock memory barrier semantics.
*/ */
clear_bit_unlock(tag, bqt->tag_map); clear_bit_unlock(tag, bqt->tag_map);
bqt->busy--;
} }
EXPORT_SYMBOL(blk_queue_end_tag); EXPORT_SYMBOL(blk_queue_end_tag);
@ -368,7 +367,6 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)
bqt->tag_index[tag] = rq; bqt->tag_index[tag] = rq;
blkdev_dequeue_request(rq); blkdev_dequeue_request(rq);
list_add(&rq->queuelist, &q->tag_busy_list); list_add(&rq->queuelist, &q->tag_busy_list);
bqt->busy++;
return 0; return 0;
} }
EXPORT_SYMBOL(blk_queue_start_tag); EXPORT_SYMBOL(blk_queue_start_tag);

44
block/bsg.c
View File

@ -45,8 +45,6 @@ struct bsg_device {
char name[BUS_ID_SIZE]; char name[BUS_ID_SIZE];
int max_queue; int max_queue;
unsigned long flags; unsigned long flags;
struct blk_scsi_cmd_filter *cmd_filter;
mode_t *f_mode;
}; };
enum { enum {
@ -174,7 +172,8 @@ unlock:
} }
static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_v4 *hdr, struct bsg_device *bd) struct sg_io_v4 *hdr, struct bsg_device *bd,
int has_write_perm)
{ {
if (hdr->request_len > BLK_MAX_CDB) { if (hdr->request_len > BLK_MAX_CDB) {
rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
@ -187,8 +186,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
return -EFAULT; return -EFAULT;
if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
if (blk_cmd_filter_verify_command(bd->cmd_filter, rq->cmd, if (blk_verify_command(&q->cmd_filter, rq->cmd, has_write_perm))
bd->f_mode))
return -EPERM; return -EPERM;
} else if (!capable(CAP_SYS_RAWIO)) } else if (!capable(CAP_SYS_RAWIO))
return -EPERM; return -EPERM;
@ -244,7 +242,7 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)
* map sg_io_v4 to a request. * map sg_io_v4 to a request.
*/ */
static struct request * static struct request *
bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, int has_write_perm)
{ {
struct request_queue *q = bd->queue; struct request_queue *q = bd->queue;
struct request *rq, *next_rq = NULL; struct request *rq, *next_rq = NULL;
@ -266,7 +264,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr)
rq = blk_get_request(q, rw, GFP_KERNEL); rq = blk_get_request(q, rw, GFP_KERNEL);
if (!rq) if (!rq)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd); ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm);
if (ret) if (ret)
goto out; goto out;
@ -568,25 +566,6 @@ static inline void bsg_set_block(struct bsg_device *bd, struct file *file)
set_bit(BSG_F_BLOCK, &bd->flags); set_bit(BSG_F_BLOCK, &bd->flags);
} }
static void bsg_set_cmd_filter(struct bsg_device *bd,
struct file *file)
{
struct inode *inode;
struct gendisk *disk;
if (!file)
return;
inode = file->f_dentry->d_inode;
if (!inode)
return;
disk = inode->i_bdev->bd_disk;
bd->cmd_filter = &disk->cmd_filter;
bd->f_mode = &file->f_mode;
}
/* /*
* Check if the error is a "real" error that we should return. * Check if the error is a "real" error that we should return.
*/ */
@ -608,7 +587,6 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
dprintk("%s: read %Zd bytes\n", bd->name, count); dprintk("%s: read %Zd bytes\n", bd->name, count);
bsg_set_block(bd, file); bsg_set_block(bd, file);
bsg_set_cmd_filter(bd, file);
bytes_read = 0; bytes_read = 0;
ret = __bsg_read(buf, count, bd, NULL, &bytes_read); ret = __bsg_read(buf, count, bd, NULL, &bytes_read);
@ -621,7 +599,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
} }
static int __bsg_write(struct bsg_device *bd, const char __user *buf, static int __bsg_write(struct bsg_device *bd, const char __user *buf,
size_t count, ssize_t *bytes_written) size_t count, ssize_t *bytes_written, int has_write_perm)
{ {
struct bsg_command *bc; struct bsg_command *bc;
struct request *rq; struct request *rq;
@ -652,7 +630,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf,
/* /*
* get a request, fill in the blanks, and add to request queue * get a request, fill in the blanks, and add to request queue
*/ */
rq = bsg_map_hdr(bd, &bc->hdr); rq = bsg_map_hdr(bd, &bc->hdr, has_write_perm);
if (IS_ERR(rq)) { if (IS_ERR(rq)) {
ret = PTR_ERR(rq); ret = PTR_ERR(rq);
rq = NULL; rq = NULL;
@ -683,10 +661,11 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
dprintk("%s: write %Zd bytes\n", bd->name, count); dprintk("%s: write %Zd bytes\n", bd->name, count);
bsg_set_block(bd, file); bsg_set_block(bd, file);
bsg_set_cmd_filter(bd, file);
bytes_written = 0; bytes_written = 0;
ret = __bsg_write(bd, buf, count, &bytes_written); ret = __bsg_write(bd, buf, count, &bytes_written,
file->f_mode & FMODE_WRITE);
*ppos = bytes_written; *ppos = bytes_written;
/* /*
@ -792,7 +771,6 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
bd->queue = rq; bd->queue = rq;
bsg_set_block(bd, file); bsg_set_block(bd, file);
bsg_set_cmd_filter(bd, file);
atomic_set(&bd->ref_count, 1); atomic_set(&bd->ref_count, 1);
mutex_lock(&bsg_mutex); mutex_lock(&bsg_mutex);
@ -943,7 +921,7 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (copy_from_user(&hdr, uarg, sizeof(hdr))) if (copy_from_user(&hdr, uarg, sizeof(hdr)))
return -EFAULT; return -EFAULT;
rq = bsg_map_hdr(bd, &hdr); rq = bsg_map_hdr(bd, &hdr, file->f_mode & FMODE_WRITE);
if (IS_ERR(rq)) if (IS_ERR(rq))
return PTR_ERR(rq); return PTR_ERR(rq);

198
block/cmd-filter.c
View File

@ -20,15 +20,14 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/genhd.h> #include <linux/genhd.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/parser.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <linux/cdrom.h> #include <linux/cdrom.h>
int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, int blk_verify_command(struct blk_cmd_filter *filter,
unsigned char *cmd, mode_t *f_mode) unsigned char *cmd, int has_write_perm)
{ {
/* root can do any command. */ /* root can do any command. */
if (capable(CAP_SYS_RAWIO)) if (capable(CAP_SYS_RAWIO))
@ -43,34 +42,15 @@ int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter,
return 0; return 0;
/* Write-safe commands require a writable open */ /* Write-safe commands require a writable open */
if (test_bit(cmd[0], filter->write_ok) && (*f_mode & FMODE_WRITE)) if (test_bit(cmd[0], filter->write_ok) && has_write_perm)
return 0; return 0;
return -EPERM; return -EPERM;
} }
EXPORT_SYMBOL(blk_cmd_filter_verify_command);
int blk_verify_command(struct file *file, unsigned char *cmd)
{
struct gendisk *disk;
struct inode *inode;
if (!file)
return -EINVAL;
inode = file->f_dentry->d_inode;
if (!inode)
return -EINVAL;
disk = inode->i_bdev->bd_disk;
return blk_cmd_filter_verify_command(&disk->cmd_filter,
cmd, &file->f_mode);
}
EXPORT_SYMBOL(blk_verify_command); EXPORT_SYMBOL(blk_verify_command);
/* and now, the sysfs stuff */ /* and now, the sysfs stuff */
static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page,
int rw) int rw)
{ {
char *npage = page; char *npage = page;
@ -84,8 +64,7 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page,
for (i = 0; i < BLK_SCSI_MAX_CMDS; i++) { for (i = 0; i < BLK_SCSI_MAX_CMDS; i++) {
if (test_bit(i, okbits)) { if (test_bit(i, okbits)) {
sprintf(npage, "%02x", i); npage += sprintf(npage, "0x%02x", i);
npage += 2;
if (i < BLK_SCSI_MAX_CMDS - 1) if (i < BLK_SCSI_MAX_CMDS - 1)
sprintf(npage++, " "); sprintf(npage++, " ");
} }
@ -97,57 +76,65 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page,
return npage - page; return npage - page;
} }
static ssize_t rcf_readcmds_show(struct blk_scsi_cmd_filter *filter, char *page) static ssize_t rcf_readcmds_show(struct blk_cmd_filter *filter, char *page)
{ {
return rcf_cmds_show(filter, page, READ); return rcf_cmds_show(filter, page, READ);
} }
static ssize_t rcf_writecmds_show(struct blk_scsi_cmd_filter *filter, static ssize_t rcf_writecmds_show(struct blk_cmd_filter *filter,
char *page) char *page)
{ {
return rcf_cmds_show(filter, page, WRITE); return rcf_cmds_show(filter, page, WRITE);
} }
static ssize_t rcf_cmds_store(struct blk_scsi_cmd_filter *filter, static ssize_t rcf_cmds_store(struct blk_cmd_filter *filter,
const char *page, size_t count, int rw) const char *page, size_t count, int rw)
{ {
ssize_t ret = 0;
unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits; unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits;
int cmd, status, len; int cmd, set;
substring_t ss; char *p, *status;
memset(&okbits, 0, sizeof(okbits)); if (rw == READ) {
memcpy(&okbits, filter->read_ok, sizeof(okbits));
for (len = strlen(page); len > 0; len -= 3) { target_okbits = filter->read_ok;
if (len < 2) } else {
break; memcpy(&okbits, filter->write_ok, sizeof(okbits));
ss.from = (char *) page + ret; target_okbits = filter->write_ok;
ss.to = (char *) page + ret + 2;
ret += 3;
status = match_hex(&ss, &cmd);
/* either of these cases means invalid input, so do nothing. */
if (status || cmd >= BLK_SCSI_MAX_CMDS)
return -EINVAL;
__set_bit(cmd, okbits);
} }
if (rw == READ) while ((p = strsep((char **)&page, " ")) != NULL) {
target_okbits = filter->read_ok; set = 1;
else
target_okbits = filter->write_ok;
memmove(target_okbits, okbits, sizeof(okbits)); if (p[0] == '+') {
p++;
} else if (p[0] == '-') {
set = 0;
p++;
}
cmd = simple_strtol(p, &status, 16);
/* either of these cases means invalid input, so do nothing. */
if ((status == p) || cmd >= BLK_SCSI_MAX_CMDS)
return -EINVAL;
if (set)
__set_bit(cmd, okbits);
else
__clear_bit(cmd, okbits);
}
memcpy(target_okbits, okbits, sizeof(okbits));
return count; return count;
} }
static ssize_t rcf_readcmds_store(struct blk_scsi_cmd_filter *filter, static ssize_t rcf_readcmds_store(struct blk_cmd_filter *filter,
const char *page, size_t count) const char *page, size_t count)
{ {
return rcf_cmds_store(filter, page, count, READ); return rcf_cmds_store(filter, page, count, READ);
} }
static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter, static ssize_t rcf_writecmds_store(struct blk_cmd_filter *filter,
const char *page, size_t count) const char *page, size_t count)
{ {
return rcf_cmds_store(filter, page, count, WRITE); return rcf_cmds_store(filter, page, count, WRITE);
@ -155,8 +142,8 @@ static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter,
struct rcf_sysfs_entry { struct rcf_sysfs_entry {
struct attribute attr; struct attribute attr;
ssize_t (*show)(struct blk_scsi_cmd_filter *, char *); ssize_t (*show)(struct blk_cmd_filter *, char *);
ssize_t (*store)(struct blk_scsi_cmd_filter *, const char *, size_t); ssize_t (*store)(struct blk_cmd_filter *, const char *, size_t);
}; };
static struct rcf_sysfs_entry rcf_readcmds_entry = { static struct rcf_sysfs_entry rcf_readcmds_entry = {
@ -183,9 +170,9 @@ static ssize_t
rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page) rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
{ {
struct rcf_sysfs_entry *entry = to_rcf(attr); struct rcf_sysfs_entry *entry = to_rcf(attr);
struct blk_scsi_cmd_filter *filter; struct blk_cmd_filter *filter;
filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj); filter = container_of(kobj, struct blk_cmd_filter, kobj);
if (entry->show) if (entry->show)
return entry->show(filter, page); return entry->show(filter, page);
@ -197,7 +184,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr,
const char *page, size_t length) const char *page, size_t length)
{ {
struct rcf_sysfs_entry *entry = to_rcf(attr); struct rcf_sysfs_entry *entry = to_rcf(attr);
struct blk_scsi_cmd_filter *filter; struct blk_cmd_filter *filter;
if (!capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_RAWIO))
return -EPERM; return -EPERM;
@ -205,7 +192,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr,
if (!entry->store) if (!entry->store)
return -EINVAL; return -EINVAL;
filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj); filter = container_of(kobj, struct blk_cmd_filter, kobj);
return entry->store(filter, page, length); return entry->store(filter, page, length);
} }
@ -219,114 +206,27 @@ static struct kobj_type rcf_ktype = {
.default_attrs = default_attrs, .default_attrs = default_attrs,
}; };
#ifndef MAINTENANCE_IN_CMD
#define MAINTENANCE_IN_CMD 0xa3
#endif
static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter)
{
/* Basic read-only commands */
__set_bit(TEST_UNIT_READY, filter->read_ok);
__set_bit(REQUEST_SENSE, filter->read_ok);
__set_bit(READ_6, filter->read_ok);
__set_bit(READ_10, filter->read_ok);
__set_bit(READ_12, filter->read_ok);
__set_bit(READ_16, filter->read_ok);
__set_bit(READ_BUFFER, filter->read_ok);
__set_bit(READ_DEFECT_DATA, filter->read_ok);
__set_bit(READ_CAPACITY, filter->read_ok);
__set_bit(READ_LONG, filter->read_ok);
__set_bit(INQUIRY, filter->read_ok);
__set_bit(MODE_SENSE, filter->read_ok);
__set_bit(MODE_SENSE_10, filter->read_ok);
__set_bit(LOG_SENSE, filter->read_ok);
__set_bit(START_STOP, filter->read_ok);
__set_bit(GPCMD_VERIFY_10, filter->read_ok);
__set_bit(VERIFY_16, filter->read_ok);
__set_bit(REPORT_LUNS, filter->read_ok);
__set_bit(SERVICE_ACTION_IN, filter->read_ok);
__set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok);
__set_bit(MAINTENANCE_IN_CMD, filter->read_ok);
__set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok);
/* Audio CD commands */
__set_bit(GPCMD_PLAY_CD, filter->read_ok);
__set_bit(GPCMD_PLAY_AUDIO_10, filter->read_ok);
__set_bit(GPCMD_PLAY_AUDIO_MSF, filter->read_ok);
__set_bit(GPCMD_PLAY_AUDIO_TI, filter->read_ok);
__set_bit(GPCMD_PAUSE_RESUME, filter->read_ok);
/* CD/DVD data reading */
__set_bit(GPCMD_READ_CD, filter->read_ok);
__set_bit(GPCMD_READ_CD_MSF, filter->read_ok);
__set_bit(GPCMD_READ_DISC_INFO, filter->read_ok);
__set_bit(GPCMD_READ_CDVD_CAPACITY, filter->read_ok);
__set_bit(GPCMD_READ_DVD_STRUCTURE, filter->read_ok);
__set_bit(GPCMD_READ_HEADER, filter->read_ok);
__set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter->read_ok);
__set_bit(GPCMD_READ_SUBCHANNEL, filter->read_ok);
__set_bit(GPCMD_READ_TOC_PMA_ATIP, filter->read_ok);
__set_bit(GPCMD_REPORT_KEY, filter->read_ok);
__set_bit(GPCMD_SCAN, filter->read_ok);
__set_bit(GPCMD_GET_CONFIGURATION, filter->read_ok);
__set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter->read_ok);
__set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter->read_ok);
__set_bit(GPCMD_GET_PERFORMANCE, filter->read_ok);
__set_bit(GPCMD_SEEK, filter->read_ok);
__set_bit(GPCMD_STOP_PLAY_SCAN, filter->read_ok);
/* Basic writing commands */
__set_bit(WRITE_6, filter->write_ok);
__set_bit(WRITE_10, filter->write_ok);
__set_bit(WRITE_VERIFY, filter->write_ok);
__set_bit(WRITE_12, filter->write_ok);
__set_bit(WRITE_VERIFY_12, filter->write_ok);
__set_bit(WRITE_16, filter->write_ok);
__set_bit(WRITE_LONG, filter->write_ok);
__set_bit(WRITE_LONG_2, filter->write_ok);
__set_bit(ERASE, filter->write_ok);
__set_bit(GPCMD_MODE_SELECT_10, filter->write_ok);
__set_bit(MODE_SELECT, filter->write_ok);
__set_bit(LOG_SELECT, filter->write_ok);
__set_bit(GPCMD_BLANK, filter->write_ok);
__set_bit(GPCMD_CLOSE_TRACK, filter->write_ok);
__set_bit(GPCMD_FLUSH_CACHE, filter->write_ok);
__set_bit(GPCMD_FORMAT_UNIT, filter->write_ok);
__set_bit(GPCMD_REPAIR_RZONE_TRACK, filter->write_ok);
__set_bit(GPCMD_RESERVE_RZONE_TRACK, filter->write_ok);
__set_bit(GPCMD_SEND_DVD_STRUCTURE, filter->write_ok);
__set_bit(GPCMD_SEND_EVENT, filter->write_ok);
__set_bit(GPCMD_SEND_KEY, filter->write_ok);
__set_bit(GPCMD_SEND_OPC, filter->write_ok);
__set_bit(GPCMD_SEND_CUE_SHEET, filter->write_ok);
__set_bit(GPCMD_SET_SPEED, filter->write_ok);
__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok);
__set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok);
__set_bit(GPCMD_SET_STREAMING, filter->write_ok);
}
int blk_register_filter(struct gendisk *disk) int blk_register_filter(struct gendisk *disk)
{ {
int ret; int ret;
struct blk_scsi_cmd_filter *filter = &disk->cmd_filter; struct blk_cmd_filter *filter = &disk->queue->cmd_filter;
struct kobject *parent = kobject_get(disk->holder_dir->parent); struct kobject *parent = kobject_get(disk->holder_dir->parent);
if (!parent) if (!parent)
return -ENODEV; return -ENODEV;
ret = kobject_init_and_add(&filter->kobj, &rcf_ktype, parent, ret = kobject_init_and_add(&filter->kobj, &rcf_ktype, parent,
"%s", "cmd_filter"); "%s", "cmd_filter");
if (ret < 0) if (ret < 0)
return ret; return ret;
rcf_set_defaults(filter);
return 0; return 0;
} }
void blk_unregister_filter(struct gendisk *disk) void blk_unregister_filter(struct gendisk *disk)
{ {
struct blk_scsi_cmd_filter *filter = &disk->cmd_filter; struct blk_cmd_filter *filter = &disk->queue->cmd_filter;
kobject_put(&filter->kobj); kobject_put(&filter->kobj);
kobject_put(disk->holder_dir->parent); kobject_put(disk->holder_dir->parent);

94
block/scsi_ioctl.c
View File

@ -105,12 +105,96 @@ static int sg_emulated_host(struct request_queue *q, int __user *p)
return put_user(1, p); return put_user(1, p);
} }
void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
{
/* Basic read-only commands */
__set_bit(TEST_UNIT_READY, filter->read_ok);
__set_bit(REQUEST_SENSE, filter->read_ok);
__set_bit(READ_6, filter->read_ok);
__set_bit(READ_10, filter->read_ok);
__set_bit(READ_12, filter->read_ok);
__set_bit(READ_16, filter->read_ok);
__set_bit(READ_BUFFER, filter->read_ok);
__set_bit(READ_DEFECT_DATA, filter->read_ok);
__set_bit(READ_CAPACITY, filter->read_ok);
__set_bit(READ_LONG, filter->read_ok);
__set_bit(INQUIRY, filter->read_ok);
__set_bit(MODE_SENSE, filter->read_ok);
__set_bit(MODE_SENSE_10, filter->read_ok);
__set_bit(LOG_SENSE, filter->read_ok);
__set_bit(START_STOP, filter->read_ok);
__set_bit(GPCMD_VERIFY_10, filter->read_ok);
__set_bit(VERIFY_16, filter->read_ok);
__set_bit(REPORT_LUNS, filter->read_ok);
__set_bit(SERVICE_ACTION_IN, filter->read_ok);
__set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok);
__set_bit(MAINTENANCE_IN, filter->read_ok);
__set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok);
/* Audio CD commands */
__set_bit(GPCMD_PLAY_CD, filter->read_ok);
__set_bit(GPCMD_PLAY_AUDIO_10, filter->read_ok);
__set_bit(GPCMD_PLAY_AUDIO_MSF, filter->read_ok);
__set_bit(GPCMD_PLAY_AUDIO_TI, filter->read_ok);
__set_bit(GPCMD_PAUSE_RESUME, filter->read_ok);
/* CD/DVD data reading */
__set_bit(GPCMD_READ_CD, filter->read_ok);
__set_bit(GPCMD_READ_CD_MSF, filter->read_ok);
__set_bit(GPCMD_READ_DISC_INFO, filter->read_ok);
__set_bit(GPCMD_READ_CDVD_CAPACITY, filter->read_ok);
__set_bit(GPCMD_READ_DVD_STRUCTURE, filter->read_ok);
__set_bit(GPCMD_READ_HEADER, filter->read_ok);
__set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter->read_ok);
__set_bit(GPCMD_READ_SUBCHANNEL, filter->read_ok);
__set_bit(GPCMD_READ_TOC_PMA_ATIP, filter->read_ok);
__set_bit(GPCMD_REPORT_KEY, filter->read_ok);
__set_bit(GPCMD_SCAN, filter->read_ok);
__set_bit(GPCMD_GET_CONFIGURATION, filter->read_ok);
__set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter->read_ok);
__set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter->read_ok);
__set_bit(GPCMD_GET_PERFORMANCE, filter->read_ok);
__set_bit(GPCMD_SEEK, filter->read_ok);
__set_bit(GPCMD_STOP_PLAY_SCAN, filter->read_ok);
/* Basic writing commands */
__set_bit(WRITE_6, filter->write_ok);
__set_bit(WRITE_10, filter->write_ok);
__set_bit(WRITE_VERIFY, filter->write_ok);
__set_bit(WRITE_12, filter->write_ok);
__set_bit(WRITE_VERIFY_12, filter->write_ok);
__set_bit(WRITE_16, filter->write_ok);
__set_bit(WRITE_LONG, filter->write_ok);
__set_bit(WRITE_LONG_2, filter->write_ok);
__set_bit(ERASE, filter->write_ok);
__set_bit(GPCMD_MODE_SELECT_10, filter->write_ok);
__set_bit(MODE_SELECT, filter->write_ok);
__set_bit(LOG_SELECT, filter->write_ok);
__set_bit(GPCMD_BLANK, filter->write_ok);
__set_bit(GPCMD_CLOSE_TRACK, filter->write_ok);
__set_bit(GPCMD_FLUSH_CACHE, filter->write_ok);
__set_bit(GPCMD_FORMAT_UNIT, filter->write_ok);
__set_bit(GPCMD_REPAIR_RZONE_TRACK, filter->write_ok);
__set_bit(GPCMD_RESERVE_RZONE_TRACK, filter->write_ok);
__set_bit(GPCMD_SEND_DVD_STRUCTURE, filter->write_ok);
__set_bit(GPCMD_SEND_EVENT, filter->write_ok);
__set_bit(GPCMD_SEND_KEY, filter->write_ok);
__set_bit(GPCMD_SEND_OPC, filter->write_ok);
__set_bit(GPCMD_SEND_CUE_SHEET, filter->write_ok);
__set_bit(GPCMD_SET_SPEED, filter->write_ok);
__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok);
__set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok);
__set_bit(GPCMD_SET_STREAMING, filter->write_ok);
}
EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults);
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_hdr *hdr, struct file *file) struct sg_io_hdr *hdr, struct file *file)
{ {
if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
return -EFAULT; return -EFAULT;
if (blk_verify_command(file, rq->cmd)) if (blk_verify_command(&q->cmd_filter, rq->cmd,
file->f_mode & FMODE_WRITE))
return -EPERM; return -EPERM;
/* /*
@ -298,7 +382,7 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q,
struct gendisk *disk, struct scsi_ioctl_command __user *sic) struct gendisk *disk, struct scsi_ioctl_command __user *sic)
{ {
struct request *rq; struct request *rq;
int err; int err, write_perm = 0;
unsigned int in_len, out_len, bytes, opcode, cmdlen; unsigned int in_len, out_len, bytes, opcode, cmdlen;
char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
@ -340,7 +424,11 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q,
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
goto error; goto error;
err = blk_verify_command(file, rq->cmd); /* scsi_ioctl passes NULL */
if (file && (file->f_mode & FMODE_WRITE))
write_perm = 1;
err = blk_verify_command(&q->cmd_filter, rq->cmd, write_perm);
if (err) if (err)
goto error; goto error;

17
drivers/scsi/sg.c
View File

@ -217,6 +217,18 @@ static int sg_last_dev(void);
#define SZ_SG_IOVEC sizeof(sg_iovec_t) #define SZ_SG_IOVEC sizeof(sg_iovec_t)
#define SZ_SG_REQ_INFO sizeof(sg_req_info_t) #define SZ_SG_REQ_INFO sizeof(sg_req_info_t)
static int sg_allow_access(struct file *filp, unsigned char *cmd)
{
struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
struct request_queue *q = sfp->parentdp->device->request_queue;
if (sfp->parentdp->device->type == TYPE_SCANNER)
return 0;
return blk_verify_command(&q->cmd_filter,
cmd, filp->f_mode & FMODE_WRITE);
}
static int static int
sg_open(struct inode *inode, struct file *filp) sg_open(struct inode *inode, struct file *filp)
{ {
@ -689,7 +701,7 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf,
sg_remove_request(sfp, srp); sg_remove_request(sfp, srp);
return -EFAULT; return -EFAULT;
} }
if (read_only && !blk_verify_command(file, cmnd)) { if (read_only && sg_allow_access(file, cmnd)) {
sg_remove_request(sfp, srp); sg_remove_request(sfp, srp);
return -EPERM; return -EPERM;
} }
@ -793,6 +805,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
return -ENXIO; return -ENXIO;
SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n", SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n",
sdp->disk->disk_name, (int) cmd_in)); sdp->disk->disk_name, (int) cmd_in));
read_only = (O_RDWR != (filp->f_flags & O_ACCMODE)); read_only = (O_RDWR != (filp->f_flags & O_ACCMODE));
@ -1061,7 +1074,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
if (copy_from_user(&opcode, siocp->data, 1)) if (copy_from_user(&opcode, siocp->data, 1))
return -EFAULT; return -EFAULT;
if (!blk_verify_command(filp, &opcode)) if (sg_allow_access(filp, &opcode))
return -EPERM; return -EPERM;
} }
return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p); return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p);

48
fs/bio.c
View File

@ -469,20 +469,21 @@ static void bio_free_map_data(struct bio_map_data *bmd)
kfree(bmd); kfree(bmd);
} }
static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count) static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count,
gfp_t gfp_mask)
{ {
struct bio_map_data *bmd = kmalloc(sizeof(*bmd), GFP_KERNEL); struct bio_map_data *bmd = kmalloc(sizeof(*bmd), gfp_mask);
if (!bmd) if (!bmd)
return NULL; return NULL;
bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, GFP_KERNEL); bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, gfp_mask);
if (!bmd->iovecs) { if (!bmd->iovecs) {
kfree(bmd); kfree(bmd);
return NULL; return NULL;
} }
bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, GFP_KERNEL); bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, gfp_mask);
if (bmd->sgvecs) if (bmd->sgvecs)
return bmd; return bmd;
@ -491,8 +492,8 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count)
return NULL; return NULL;
} }
static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count, static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,
int uncopy) struct sg_iovec *iov, int iov_count, int uncopy)
{ {
int ret = 0, i; int ret = 0, i;
struct bio_vec *bvec; struct bio_vec *bvec;
@ -502,7 +503,7 @@ static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
__bio_for_each_segment(bvec, bio, i, 0) { __bio_for_each_segment(bvec, bio, i, 0) {
char *bv_addr = page_address(bvec->bv_page); char *bv_addr = page_address(bvec->bv_page);
unsigned int bv_len = bvec->bv_len; unsigned int bv_len = iovecs[i].bv_len;
while (bv_len && iov_idx < iov_count) { while (bv_len && iov_idx < iov_count) {
unsigned int bytes; unsigned int bytes;
@ -554,7 +555,7 @@ int bio_uncopy_user(struct bio *bio)
struct bio_map_data *bmd = bio->bi_private; struct bio_map_data *bmd = bio->bi_private;
int ret; int ret;
ret = __bio_copy_iov(bio, bmd->sgvecs, bmd->nr_sgvecs, 1); ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs, bmd->nr_sgvecs, 1);
bio_free_map_data(bmd); bio_free_map_data(bmd);
bio_put(bio); bio_put(bio);
@ -596,7 +597,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,
len += iov[i].iov_len; len += iov[i].iov_len;
} }
bmd = bio_alloc_map_data(nr_pages, iov_count); bmd = bio_alloc_map_data(nr_pages, iov_count, GFP_KERNEL);
if (!bmd) if (!bmd)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -633,7 +634,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,
* success * success
*/ */
if (!write_to_vm) { if (!write_to_vm) {
ret = __bio_copy_iov(bio, iov, iov_count, 0); ret = __bio_copy_iov(bio, bio->bi_io_vec, iov, iov_count, 0);
if (ret) if (ret)
goto cleanup; goto cleanup;
} }
@ -942,19 +943,22 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
{ {
struct bio_vec *bvec; struct bio_vec *bvec;
const int read = bio_data_dir(bio) == READ; const int read = bio_data_dir(bio) == READ;
char *p = bio->bi_private; struct bio_map_data *bmd = bio->bi_private;
int i; int i;
char *p = bmd->sgvecs[0].iov_base;
__bio_for_each_segment(bvec, bio, i, 0) { __bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page); char *addr = page_address(bvec->bv_page);
int len = bmd->iovecs[i].bv_len;
if (read && !err) if (read && !err)
memcpy(p, addr, bvec->bv_len); memcpy(p, addr, len);
__free_page(bvec->bv_page); __free_page(bvec->bv_page);
p += bvec->bv_len; p += len;
} }
bio_free_map_data(bmd);
bio_put(bio); bio_put(bio);
} }
@ -978,11 +982,21 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
const int nr_pages = end - start; const int nr_pages = end - start;
struct bio *bio; struct bio *bio;
struct bio_vec *bvec; struct bio_vec *bvec;
struct bio_map_data *bmd;
int i, ret; int i, ret;
struct sg_iovec iov;
iov.iov_base = data;
iov.iov_len = len;
bmd = bio_alloc_map_data(nr_pages, 1, gfp_mask);
if (!bmd)
return ERR_PTR(-ENOMEM);
ret = -ENOMEM;
bio = bio_alloc(gfp_mask, nr_pages); bio = bio_alloc(gfp_mask, nr_pages);
if (!bio) if (!bio)
return ERR_PTR(-ENOMEM); goto out_bmd;
while (len) { while (len) {
struct page *page; struct page *page;
@ -1016,14 +1030,18 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
} }
} }
bio->bi_private = data; bio->bi_private = bmd;
bio->bi_end_io = bio_copy_kern_endio; bio->bi_end_io = bio_copy_kern_endio;
bio_set_map_data(bmd, bio, &iov, 1);
return bio; return bio;
cleanup: cleanup:
bio_for_each_segment(bvec, bio, i) bio_for_each_segment(bvec, bio, i)
__free_page(bvec->bv_page); __free_page(bvec->bv_page);
bio_put(bio); bio_put(bio);
out_bmd:
bio_free_map_data(bmd);
return ERR_PTR(ret); return ERR_PTR(ret);
} }

13
fs/buffer.c
View File

@ -2926,14 +2926,17 @@ int submit_bh(int rw, struct buffer_head * bh)
BUG_ON(!buffer_mapped(bh)); BUG_ON(!buffer_mapped(bh));
BUG_ON(!bh->b_end_io); BUG_ON(!bh->b_end_io);
if (buffer_ordered(bh) && (rw == WRITE)) /*
rw = WRITE_BARRIER; * Mask in barrier bit for a write (could be either a WRITE or a
* WRITE_SYNC
*/
if (buffer_ordered(bh) && (rw & WRITE))
rw |= WRITE_BARRIER;
/* /*
* Only clear out a write error when rewriting, should this * Only clear out a write error when rewriting
* include WRITE_SYNC as well?
*/ */
if (test_set_buffer_req(bh) && (rw == WRITE || rw == WRITE_BARRIER)) if (test_set_buffer_req(bh) && (rw & WRITE))
clear_buffer_write_io_error(bh); clear_buffer_write_io_error(bh);
/* /*

18
include/linux/blkdev.h
View File

@ -280,6 +280,15 @@ struct blk_queue_tag {
atomic_t refcnt; /* map can be shared */ atomic_t refcnt; /* map can be shared */
}; };
#define BLK_SCSI_MAX_CMDS (256)
#define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
struct blk_cmd_filter {
unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
struct kobject kobj;
};
struct request_queue struct request_queue
{ {
/* /*
@ -398,6 +407,7 @@ struct request_queue
#if defined(CONFIG_BLK_DEV_BSG) #if defined(CONFIG_BLK_DEV_BSG)
struct bsg_class_device bsg_dev; struct bsg_class_device bsg_dev;
#endif #endif
struct blk_cmd_filter cmd_filter;
}; };
#define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */
@ -807,8 +817,6 @@ extern void blk_put_queue(struct request_queue *);
/* /*
* tag stuff * tag stuff
*/ */
#define blk_queue_tag_depth(q) ((q)->queue_tags->busy)
#define blk_queue_tag_queue(q) ((q)->queue_tags->busy < (q)->queue_tags->max_depth)
#define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) #define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED)
extern int blk_queue_start_tag(struct request_queue *, struct request *); extern int blk_queue_start_tag(struct request_queue *, struct request *);
extern struct request *blk_queue_find_tag(struct request_queue *, int); extern struct request *blk_queue_find_tag(struct request_queue *, int);
@ -833,11 +841,11 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *);
/* /*
* command filter functions * command filter functions
*/ */
extern int blk_verify_command(struct file *file, unsigned char *cmd); extern int blk_verify_command(struct blk_cmd_filter *filter,
extern int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, unsigned char *cmd, int has_write_perm);
unsigned char *cmd, mode_t *f_mode);
extern int blk_register_filter(struct gendisk *disk); extern int blk_register_filter(struct gendisk *disk);
extern void blk_unregister_filter(struct gendisk *disk); extern void blk_unregister_filter(struct gendisk *disk);
extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter);
#define MAX_PHYS_SEGMENTS 128 #define MAX_PHYS_SEGMENTS 128
#define MAX_HW_SEGMENTS 128 #define MAX_HW_SEGMENTS 128

10
include/linux/genhd.h
View File

@ -110,15 +110,6 @@ struct hd_struct {
#define GENHD_FL_SUPPRESS_PARTITION_INFO 32 #define GENHD_FL_SUPPRESS_PARTITION_INFO 32
#define GENHD_FL_FAIL 64 #define GENHD_FL_FAIL 64
#define BLK_SCSI_MAX_CMDS (256)
#define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
struct blk_scsi_cmd_filter {
unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
struct kobject kobj;
};
struct gendisk { struct gendisk {
int major; /* major number of driver */ int major; /* major number of driver */
int first_minor; int first_minor;
@ -128,7 +119,6 @@ struct gendisk {
struct hd_struct **part; /* [indexed by minor] */ struct hd_struct **part; /* [indexed by minor] */
struct block_device_operations *fops; struct block_device_operations *fops;
struct request_queue *queue; struct request_queue *queue;
struct blk_scsi_cmd_filter cmd_filter;
void *private_data; void *private_data;
sector_t capacity; sector_t capacity;