History

security: Make inode argument of inode_getsecurity non-const

Make the inode argument of the inode_getsecurity hook non-const so that we can use it to revalidate invalid security labels.

Andreas Gruenbacher committed 10 years ago

Commit ea861df1 parent a44ca525 files · +6 −6Browse files

Unified · Split

5 files
  1. include/linux/lsm_hooks.h +1 −1
  2. include/linux/security.h +2 −2
  3. security/security.c +1 −1
  4. security/selinux/hooks.c +1 −1
  5. security/smack/smack_lsm.c +1 −1
include/linux/lsm_hooks.h+1−1
@@ -1413,7 +1413,7 @@ union security_list_options { · 1412 unmodified lines
14131413 int (*inode_removexattr)(struct dentry *dentry, const char *name);
14141414 int (*inode_need_killpriv)(struct dentry *dentry);
14151415 int (*inode_killpriv)(struct dentry *dentry);
1416− int (*inode_getsecurity)(const struct inode *inode, const char *name,
1416+ int (*inode_getsecurity)(struct inode *inode, const char *name,
14171417 void **buffer, bool alloc);
14181418 int (*inode_setsecurity)(struct inode *inode, const char *name,
14191419 const void *value, size_t size,
include/linux/security.h+2−2
@@ -270,7 +270,7 @@ int security_inode_listxattr(struct dentry *dentry); · 269 unmodified lines
270270 int security_inode_removexattr(struct dentry *dentry, const char *name);
271271 int security_inode_need_killpriv(struct dentry *dentry);
272272 int security_inode_killpriv(struct dentry *dentry);
273−int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc);
273+int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc);
274274 int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags);
275275 int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size);
276276 void security_inode_getsecid(const struct inode *inode, u32 *secid);
@@ -719,7 +719,7 @@ static inline int security_inode_killpriv(struct dentry *dentry) · 442 unmodified lines
719719 return cap_inode_killpriv(dentry);
720720 }
721721
722−static inline int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc)
722+static inline int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc)
723723 {
724724 return -EOPNOTSUPP;
725725 }
security/security.c+1−1
@@ -697,7 +697,7 @@ int security_inode_killpriv(struct dentry *dentry) · 696 unmodified lines
697697 return call_int_hook(inode_killpriv, 0, dentry);
698698 }
699699
700−int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc)
700+int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc)
701701 {
702702 if (unlikely(IS_PRIVATE(inode)))
703703 return -EOPNOTSUPP;
security/selinux/hooks.c+1−1
@@ -3108,7 +3108,7 @@ static int selinux_inode_removexattr(struct dentry *dentry, const char *name) · 3107 unmodified lines
31083108 *
31093109 * Permission check is handled by selinux_inode_getxattr hook.
31103110 */
3111−static int selinux_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc)
3111+static int selinux_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc)
31123112 {
31133113 u32 size;
31143114 int error;
security/smack/smack_lsm.c+1−1
@@ -1465,7 +1465,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name) · 1464 unmodified lines
14651465 *
14661466 * Returns the size of the attribute or an error code
14671467 */
1468−static int smack_inode_getsecurity(const struct inode *inode,
1468+static int smack_inode_getsecurity(struct inode *inode,
14691469 const char *name, void **buffer,
14701470 bool alloc)
14711471 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t