The inode_setsecctx hook receives a struct path, so rename it to path_setsecctx to follow the path_* naming convention used for the other hooks that take a struct path (path_chmod, path_chown, ...). Rename the security_inode_setsecctx() inline wrapper to security_path_setsecctx() and the SELinux and Smack implementations accordingly.
Signed-off-by: Cai Xinchen <[email protected]> --- fs/nfsd/vfs.c | 2 +- include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 4 ++-- security/security.c | 8 ++++---- security/selinux/hooks.c | 4 ++-- security/smack/smack_lsm.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 870756842882..3362ac3e1a41 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -628,7 +628,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, break; } if (attr->na_seclabel && attr->na_seclabel->len) - attr->na_labelerr = security_inode_setsecctx(&path, + attr->na_labelerr = security_path_setsecctx(&path, attr->na_seclabel->data, attr->na_seclabel->len); if (IS_ENABLED(CONFIG_FS_POSIX_ACL) && attr->na_dpacl) { if (!S_ISDIR(inode->i_mode)) diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index 683c4d7a8024..5b25077d17e5 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -334,7 +334,7 @@ LSM_HOOK(int, 0, inode_notifysecctx, struct inode *inode, void *ctx, u32 ctxlen) * taking a struct path; the VFS makes no guarantees with regard to * @path->mnt. */ -LSM_HOOK(int, 0, inode_setsecctx, const struct path *path, void *ctx, u32 ctxlen) +LSM_HOOK(int, 0, path_setsecctx, const struct path *path, void *ctx, u32 ctxlen) LSM_HOOK(int, -EOPNOTSUPP, inode_getsecctx, struct inode *inode, struct lsm_context *cp) diff --git a/include/linux/security.h b/include/linux/security.h index edba134db8f6..cf683b89737b 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -597,7 +597,7 @@ int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid); void security_release_secctx(struct lsm_context *cp); void security_inode_invalidate_secctx(struct inode *inode); int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); -int security_inode_setsecctx(const struct path *path, void *ctx, u32 ctxlen); +int security_path_setsecctx(const struct path *path, void *ctx, u32 ctxlen); int security_inode_getsecctx(struct inode *inode, struct lsm_context *cp); int security_locked_down(enum lockdown_reason what); int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len, @@ -1649,7 +1649,7 @@ static inline int security_inode_notifysecctx(struct inode *inode, void *ctx, u3 { return -EOPNOTSUPP; } -static inline int security_inode_setsecctx(const struct path *path, void *ctx, u32 ctxlen) +static inline int security_path_setsecctx(const struct path *path, void *ctx, u32 ctxlen) { return -EOPNOTSUPP; } diff --git a/security/security.c b/security/security.c index 919763c61994..fa14bf5dd036 100644 --- a/security/security.c +++ b/security/security.c @@ -4131,7 +4131,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen) EXPORT_SYMBOL(security_inode_notifysecctx); /** - * security_inode_setsecctx() - Change the security label of an inode + * security_path_setsecctx() - Change the security label of an inode * @path: inode (the VFS makes no guarantees with regard to @path->mnt) * @ctx: secctx * @ctxlen: length of secctx @@ -4146,11 +4146,11 @@ EXPORT_SYMBOL(security_inode_notifysecctx); * * Return: Returns 0 on success, error on failure. */ -int security_inode_setsecctx(const struct path *path, void *ctx, u32 ctxlen) +int security_path_setsecctx(const struct path *path, void *ctx, u32 ctxlen) { - return call_int_hook(inode_setsecctx, path, ctx, ctxlen); + return call_int_hook(path_setsecctx, path, ctx, ctxlen); } -EXPORT_SYMBOL(security_inode_setsecctx); +EXPORT_SYMBOL(security_path_setsecctx); /** * security_inode_getsecctx() - Get the security label of an inode diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 8bafa530806e..cd04b09a8a7d 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -7157,7 +7157,7 @@ static int selinux_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen /* * called with inode->i_mutex locked */ -static int selinux_inode_setsecctx(const struct path *path, void *ctx, u32 ctxlen) +static int selinux_path_setsecctx(const struct path *path, void *ctx, u32 ctxlen) { return __vfs_setxattr_locked(&nop_mnt_idmap, path, XATTR_NAME_SELINUX, ctx, ctxlen, 0, NULL, NULL); @@ -7831,7 +7831,7 @@ static struct security_hook_list selinux_hooks[] __ro_after_init = { LSM_HOOK_INIT(release_secctx, selinux_release_secctx), LSM_HOOK_INIT(inode_invalidate_secctx, selinux_inode_invalidate_secctx), LSM_HOOK_INIT(inode_notifysecctx, selinux_inode_notifysecctx), - LSM_HOOK_INIT(inode_setsecctx, selinux_inode_setsecctx), + LSM_HOOK_INIT(path_setsecctx, selinux_path_setsecctx), LSM_HOOK_INIT(unix_stream_connect, selinux_socket_unix_stream_connect), LSM_HOOK_INIT(unix_may_send, selinux_socket_unix_may_send), diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 95a048bcf3a6..b3475253e879 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -4998,7 +4998,7 @@ static int smack_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen) ctxlen, 0); } -static int smack_inode_setsecctx(const struct path *path, void *ctx, u32 ctxlen) +static int smack_path_setsecctx(const struct path *path, void *ctx, u32 ctxlen) { return __vfs_setxattr_locked(&nop_mnt_idmap, path, XATTR_NAME_SMACK, ctx, ctxlen, 0, NULL, NULL); @@ -5323,7 +5323,7 @@ static struct security_hook_list smack_hooks[] __ro_after_init = { LSM_HOOK_INIT(lsmprop_to_secctx, smack_lsmprop_to_secctx), LSM_HOOK_INIT(secctx_to_secid, smack_secctx_to_secid), LSM_HOOK_INIT(inode_notifysecctx, smack_inode_notifysecctx), - LSM_HOOK_INIT(inode_setsecctx, smack_inode_setsecctx), + LSM_HOOK_INIT(path_setsecctx, smack_path_setsecctx), LSM_HOOK_INIT(inode_getsecctx, smack_inode_getsecctx), LSM_HOOK_INIT(inode_copy_up, smack_inode_copy_up), LSM_HOOK_INIT(inode_copy_up_xattr, smack_inode_copy_up_xattr), -- 2.18.0.huawei.25
