diff options
| author | James Morris <jmorris@namei.org> | 2009-02-05 19:01:45 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-02-05 19:01:45 -0500 |
| commit | cb5629b10d64a8006622ce3a52bc887d91057d69 (patch) | |
| tree | 7c06d8f30783115e3384721046258ce615b129c5 /lib/dynamic_printk.c | |
| parent | 8920d5ad6ba74ae8ab020e90cc4d976980e68701 (diff) | |
| parent | f01d1d546abb2f4028b5299092f529eefb01253a (diff) | |
Merge branch 'master' into next
Conflicts:
fs/namei.c
Manually merged per:
diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
nd->flags |= LOOKUP_CONTINUE;
err = exec_permission_lite(inode);
if (err == -EAGAIN)
- err = vfs_permission(nd, MAY_EXEC);
+ err = inode_permission(nd->path.dentry->d_inode,
+ MAY_EXEC);
+ if (!err)
+ err = ima_path_check(&nd->path, MAY_EXEC);
if (err)
break;
@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
flag &= ~O_TRUNC;
}
- error = vfs_permission(nd, acc_mode);
+ error = inode_permission(inode, acc_mode);
if (error)
return error;
+
- error = ima_path_check(&nd->path,
++ error = ima_path_check(path,
+ acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
+ if (error)
+ return error;
/*
* An append-only file must be opened in append mode for writing.
*/
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'lib/dynamic_printk.c')
| -rw-r--r-- | lib/dynamic_printk.c | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c index 8e30295e8566..165a19763dc9 100644 --- a/lib/dynamic_printk.c +++ b/lib/dynamic_printk.c | |||
| @@ -277,40 +277,34 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf, | |||
| 277 | dynamic_enabled = DYNAMIC_ENABLED_NONE; | 277 | dynamic_enabled = DYNAMIC_ENABLED_NONE; |
| 278 | } | 278 | } |
| 279 | err = 0; | 279 | err = 0; |
| 280 | } else { | 280 | } else if (elem) { |
| 281 | if (elem) { | 281 | if (value && (elem->enable == 0)) { |
| 282 | if (value && (elem->enable == 0)) { | 282 | dynamic_printk_enabled |= (1LL << elem->hash1); |
| 283 | dynamic_printk_enabled |= | 283 | dynamic_printk_enabled2 |= (1LL << elem->hash2); |
| 284 | (1LL << elem->hash1); | 284 | elem->enable = 1; |
| 285 | dynamic_printk_enabled2 |= | 285 | num_enabled++; |
| 286 | (1LL << elem->hash2); | 286 | dynamic_enabled = DYNAMIC_ENABLED_SOME; |
| 287 | elem->enable = 1; | 287 | err = 0; |
| 288 | num_enabled++; | 288 | printk(KERN_DEBUG |
| 289 | dynamic_enabled = DYNAMIC_ENABLED_SOME; | 289 | "debugging enabled for module %s\n", |
| 290 | err = 0; | 290 | elem->name); |
| 291 | printk(KERN_DEBUG | 291 | } else if (!value && (elem->enable == 1)) { |
| 292 | "debugging enabled for module %s\n", | 292 | elem->enable = 0; |
| 293 | elem->name); | 293 | num_enabled--; |
| 294 | } else if (!value && (elem->enable == 1)) { | 294 | if (disabled_hash(elem->hash1, true)) |
| 295 | elem->enable = 0; | 295 | dynamic_printk_enabled &= |
| 296 | num_enabled--; | ||
| 297 | if (disabled_hash(elem->hash1, true)) | ||
| 298 | dynamic_printk_enabled &= | ||
| 299 | ~(1LL << elem->hash1); | 296 | ~(1LL << elem->hash1); |
| 300 | if (disabled_hash(elem->hash2, false)) | 297 | if (disabled_hash(elem->hash2, false)) |
| 301 | dynamic_printk_enabled2 &= | 298 | dynamic_printk_enabled2 &= |
| 302 | ~(1LL << elem->hash2); | 299 | ~(1LL << elem->hash2); |
| 303 | if (num_enabled) | 300 | if (num_enabled) |
| 304 | dynamic_enabled = | 301 | dynamic_enabled = DYNAMIC_ENABLED_SOME; |
| 305 | DYNAMIC_ENABLED_SOME; | 302 | else |
| 306 | else | 303 | dynamic_enabled = DYNAMIC_ENABLED_NONE; |
| 307 | dynamic_enabled = | 304 | err = 0; |
| 308 | DYNAMIC_ENABLED_NONE; | 305 | printk(KERN_DEBUG |
| 309 | err = 0; | 306 | "debugging disabled for module %s\n", |
| 310 | printk(KERN_DEBUG | 307 | elem->name); |
| 311 | "debugging disabled for module " | ||
| 312 | "%s\n", elem->name); | ||
| 313 | } | ||
| 314 | } | 308 | } |
| 315 | } | 309 | } |
| 316 | } | 310 | } |