projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cross-platform/clkdev' into next/cross-platform
[firefly-linux-kernel-4.4.55.git]
/
security
/
device_cgroup.c
diff --git
a/security/device_cgroup.c
b/security/device_cgroup.c
index 8d9c48f13774b8d35d7bbb8444aafb4681c2d394..1be68269e1c2a2c55e2db2cc46d206539c5f79f3 100644
(file)
--- a/
security/device_cgroup.c
+++ b/
security/device_cgroup.c
@@
-62,8
+62,7
@@
static inline struct dev_cgroup *task_devcgroup(struct task_struct *task)
struct cgroup_subsys devices_subsys;
static int devcgroup_can_attach(struct cgroup_subsys *ss,
struct cgroup_subsys devices_subsys;
static int devcgroup_can_attach(struct cgroup_subsys *ss,
- struct cgroup *new_cgroup, struct task_struct *task,
- bool threadgroup)
+ struct cgroup *new_cgroup, struct task_struct *task)
{
if (current != task && !capable(CAP_SYS_ADMIN))
return -EPERM;
{
if (current != task && !capable(CAP_SYS_ADMIN))
return -EPERM;
@@
-475,17
+474,11
@@
struct cgroup_subsys devices_subsys = {
.subsys_id = devices_subsys_id,
};
.subsys_id = devices_subsys_id,
};
-int devcgroup_inode_permission(struct inode *inode, int mask)
+int
__
devcgroup_inode_permission(struct inode *inode, int mask)
{
struct dev_cgroup *dev_cgroup;
struct dev_whitelist_item *wh;
{
struct dev_cgroup *dev_cgroup;
struct dev_whitelist_item *wh;
- dev_t device = inode->i_rdev;
- if (!device)
- return 0;
- if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode))
- return 0;
-
rcu_read_lock();
dev_cgroup = task_devcgroup(current);
rcu_read_lock();
dev_cgroup = task_devcgroup(current);