diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 03:45:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 03:45:31 -0400 |
| commit | 36b8d186e6cc8e32cb5227f5645a58e1bc0af190 (patch) | |
| tree | 1000ad26e189e6ff2c53fb7eeff605f59c7ad94e /mm | |
| parent | cd85b557414fe4cd44ea6608825e96612a5fe2b2 (diff) | |
| parent | c45ed235abf1b0b6666417e3c394f18717976acd (diff) | |
Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security
* 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
TOMOYO: Fix incomplete read after seek.
Smack: allow to access /smack/access as normal user
TOMOYO: Fix unused kernel config option.
Smack: fix: invalid length set for the result of /smack/access
Smack: compilation fix
Smack: fix for /smack/access output, use string instead of byte
Smack: domain transition protections (v3)
Smack: Provide information for UDS getsockopt(SO_PEERCRED)
Smack: Clean up comments
Smack: Repair processing of fcntl
Smack: Rule list lookup performance
Smack: check permissions from user space (v2)
TOMOYO: Fix quota and garbage collector.
TOMOYO: Remove redundant tasklist_lock.
TOMOYO: Fix domain transition failure warning.
TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
TOMOYO: Simplify garbage collector.
TOMOYO: Fix make namespacecheck warnings.
target: check hex2bin result
encrypted-keys: check hex2bin result
...
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 32f6763f16fb..2d3577295298 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -1458,7 +1458,7 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) | |||
| 1458 | inode = shmem_get_inode(dir->i_sb, dir, mode, dev, VM_NORESERVE); | 1458 | inode = shmem_get_inode(dir->i_sb, dir, mode, dev, VM_NORESERVE); |
| 1459 | if (inode) { | 1459 | if (inode) { |
| 1460 | error = security_inode_init_security(inode, dir, | 1460 | error = security_inode_init_security(inode, dir, |
| 1461 | &dentry->d_name, NULL, | 1461 | &dentry->d_name, |
| 1462 | NULL, NULL); | 1462 | NULL, NULL); |
| 1463 | if (error) { | 1463 | if (error) { |
| 1464 | if (error != -EOPNOTSUPP) { | 1464 | if (error != -EOPNOTSUPP) { |
| @@ -1598,7 +1598,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s | |||
| 1598 | if (!inode) | 1598 | if (!inode) |
| 1599 | return -ENOSPC; | 1599 | return -ENOSPC; |
| 1600 | 1600 | ||
| 1601 | error = security_inode_init_security(inode, dir, &dentry->d_name, NULL, | 1601 | error = security_inode_init_security(inode, dir, &dentry->d_name, |
| 1602 | NULL, NULL); | 1602 | NULL, NULL); |
| 1603 | if (error) { | 1603 | if (error) { |
| 1604 | if (error != -EOPNOTSUPP) { | 1604 | if (error != -EOPNOTSUPP) { |