mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 09:13:55 +08:00
VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.
Summary of http://lkml.org/lkml/2014/3/14/363 : Ted: module_param(queue_depth, int, 444) Joe: 0444! Rusty: User perms >= group perms >= other perms? Joe: CLASS_ATTR, DEVICE_ATTR, SENSOR_ATTR and SENSOR_ATTR_2? Side effect of stricter permissions means removing the unnecessary S_IFREG from several callers. Note that the BUILD_BUG_ON_ZERO((perm) & 2) test was removed: a fair number of drivers fail this test, so that will be the debate for a future patch. Suggested-by: Joe Perches <joe@perches.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> for drivers/pci/slot.c Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Miklos Szeredi <miklos@szeredi.hu> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
parent
c6bda7c988
commit
58f86cc89c
@ -116,11 +116,11 @@ static void pci_slot_release(struct kobject *kobj)
|
||||
}
|
||||
|
||||
static struct pci_slot_attribute pci_slot_attr_address =
|
||||
__ATTR(address, (S_IFREG | S_IRUGO), address_read_file, NULL);
|
||||
__ATTR(address, S_IRUGO, address_read_file, NULL);
|
||||
static struct pci_slot_attribute pci_slot_attr_max_speed =
|
||||
__ATTR(max_bus_speed, (S_IFREG | S_IRUGO), max_speed_read_file, NULL);
|
||||
__ATTR(max_bus_speed, S_IRUGO, max_speed_read_file, NULL);
|
||||
static struct pci_slot_attribute pci_slot_attr_cur_speed =
|
||||
__ATTR(cur_bus_speed, (S_IFREG | S_IRUGO), cur_speed_read_file, NULL);
|
||||
__ATTR(cur_bus_speed, S_IRUGO, cur_speed_read_file, NULL);
|
||||
|
||||
static struct attribute *pci_slot_default_attrs[] = {
|
||||
&pci_slot_attr_address.attr,
|
||||
|
@ -568,7 +568,7 @@ static ssize_t cuse_class_waiting_show(struct device *dev,
|
||||
|
||||
return sprintf(buf, "%d\n", atomic_read(&cc->fc.num_waiting));
|
||||
}
|
||||
static DEVICE_ATTR(waiting, S_IFREG | 0400, cuse_class_waiting_show, NULL);
|
||||
static DEVICE_ATTR(waiting, 0400, cuse_class_waiting_show, NULL);
|
||||
|
||||
static ssize_t cuse_class_abort_store(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
@ -579,7 +579,7 @@ static ssize_t cuse_class_abort_store(struct device *dev,
|
||||
fuse_abort_conn(&cc->fc);
|
||||
return count;
|
||||
}
|
||||
static DEVICE_ATTR(abort, S_IFREG | 0200, NULL, cuse_class_abort_store);
|
||||
static DEVICE_ATTR(abort, 0200, NULL, cuse_class_abort_store);
|
||||
|
||||
static struct attribute *cuse_class_dev_attrs[] = {
|
||||
&dev_attr_waiting.attr,
|
||||
|
@ -41,7 +41,7 @@ static ssize_t version_show(struct kobject *kobj, struct kobj_attribute *attr,
|
||||
return snprintf(buf, PAGE_SIZE, "%u\n", O2NM_API_VERSION);
|
||||
}
|
||||
static struct kobj_attribute attr_version =
|
||||
__ATTR(interface_revision, S_IFREG | S_IRUGO, version_show, NULL);
|
||||
__ATTR(interface_revision, S_IRUGO, version_show, NULL);
|
||||
|
||||
static struct attribute *o2cb_attrs[] = {
|
||||
&attr_version.attr,
|
||||
|
@ -494,7 +494,7 @@ static ssize_t ocfs2_max_locking_protocol_show(struct kobject *kobj,
|
||||
}
|
||||
|
||||
static struct kobj_attribute ocfs2_attr_max_locking_protocol =
|
||||
__ATTR(max_locking_protocol, S_IFREG | S_IRUGO,
|
||||
__ATTR(max_locking_protocol, S_IRUGO,
|
||||
ocfs2_max_locking_protocol_show, NULL);
|
||||
|
||||
static ssize_t ocfs2_loaded_cluster_plugins_show(struct kobject *kobj,
|
||||
@ -526,7 +526,7 @@ static ssize_t ocfs2_loaded_cluster_plugins_show(struct kobject *kobj,
|
||||
}
|
||||
|
||||
static struct kobj_attribute ocfs2_attr_loaded_cluster_plugins =
|
||||
__ATTR(loaded_cluster_plugins, S_IFREG | S_IRUGO,
|
||||
__ATTR(loaded_cluster_plugins, S_IRUGO,
|
||||
ocfs2_loaded_cluster_plugins_show, NULL);
|
||||
|
||||
static ssize_t ocfs2_active_cluster_plugin_show(struct kobject *kobj,
|
||||
@ -548,7 +548,7 @@ static ssize_t ocfs2_active_cluster_plugin_show(struct kobject *kobj,
|
||||
}
|
||||
|
||||
static struct kobj_attribute ocfs2_attr_active_cluster_plugin =
|
||||
__ATTR(active_cluster_plugin, S_IFREG | S_IRUGO,
|
||||
__ATTR(active_cluster_plugin, S_IRUGO,
|
||||
ocfs2_active_cluster_plugin_show, NULL);
|
||||
|
||||
static ssize_t ocfs2_cluster_stack_show(struct kobject *kobj,
|
||||
@ -597,7 +597,7 @@ static ssize_t ocfs2_cluster_stack_store(struct kobject *kobj,
|
||||
|
||||
|
||||
static struct kobj_attribute ocfs2_attr_cluster_stack =
|
||||
__ATTR(cluster_stack, S_IFREG | S_IRUGO | S_IWUSR,
|
||||
__ATTR(cluster_stack, S_IRUGO | S_IWUSR,
|
||||
ocfs2_cluster_stack_show,
|
||||
ocfs2_cluster_stack_store);
|
||||
|
||||
|
@ -842,4 +842,12 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
|
||||
# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
|
||||
#endif
|
||||
|
||||
/* Permissions on a sysfs file: you didn't miss the 0 prefix did you? */
|
||||
#define VERIFY_OCTAL_PERMISSIONS(perms) \
|
||||
(BUILD_BUG_ON_ZERO((perms) < 0) + \
|
||||
BUILD_BUG_ON_ZERO((perms) > 0777) + \
|
||||
/* User perms >= group perms >= other perms */ \
|
||||
BUILD_BUG_ON_ZERO(((perms) >> 6) < (((perms) >> 3) & 7)) + \
|
||||
BUILD_BUG_ON_ZERO((((perms) >> 3) & 7) < ((perms) & 7)) + \
|
||||
(perms))
|
||||
#endif
|
||||
|
@ -186,14 +186,12 @@ struct kparam_array
|
||||
parameters. */
|
||||
#define __module_param_call(prefix, name, ops, arg, perm, level) \
|
||||
/* Default value instead of permissions? */ \
|
||||
static int __param_perm_check_##name __attribute__((unused)) = \
|
||||
BUILD_BUG_ON_ZERO((perm) < 0 || (perm) > 0777 || ((perm) & 2)) \
|
||||
+ BUILD_BUG_ON_ZERO(sizeof(""prefix) > MAX_PARAM_PREFIX_LEN); \
|
||||
static const char __param_str_##name[] = prefix #name; \
|
||||
static const char __param_str_##name[] = prefix #name; \
|
||||
static struct kernel_param __moduleparam_const __param_##name \
|
||||
__used \
|
||||
__attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) \
|
||||
= { __param_str_##name, ops, perm, level, { arg } }
|
||||
= { __param_str_##name, ops, VERIFY_OCTAL_PERMISSIONS(perm), \
|
||||
level, { arg } }
|
||||
|
||||
/* Obsolete - use module_param_cb() */
|
||||
#define module_param_call(name, set, get, arg, perm) \
|
||||
|
@ -71,7 +71,8 @@ struct attribute_group {
|
||||
*/
|
||||
|
||||
#define __ATTR(_name, _mode, _show, _store) { \
|
||||
.attr = {.name = __stringify(_name), .mode = _mode }, \
|
||||
.attr = {.name = __stringify(_name), \
|
||||
.mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \
|
||||
.show = _show, \
|
||||
.store = _store, \
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user