2016-01-03 19:56:42

by Toralf Förster

Subject: [PATCH 1/2] ext4: use XATTR_*_PREFIX_LEN instead sizeof(...)

use the definition in include/uapi/linux/xattr.h

Signed-off-by: Toralf Förster <[email protected]>
---
fs/ext4/xattr_security.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index 36f4c1a..1a3d629 100644
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -16,7 +16,7 @@ ext4_xattr_security_list(const struct xattr_handler *handler,
struct dentry *dentry, char *list, size_t list_size,
const char *name, size_t name_len)
{
- const size_t prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
+ const size_t prefix_len = XATTR_SECURITY_PREFIX_LEN;
const size_t total_len = prefix_len + name_len + 1;


--
2.4.10

2016-01-03 19:56:38

by Toralf Förster

Subject: [PATCH 2/2] security: use XATTR_*_PREFIX_LEN instead sizeof(...)

use the definition in include/uapi/linux/xattr.h

igned-off-by: Toralf Förster <[email protected]>
---
security/commoncap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index 1832cf7..907a3ef 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -658,7 +658,7 @@ int cap_inode_setxattr(struct dentry *dentry, const char *name,
}

if (!strncmp(name, XATTR_SECURITY_PREFIX,
- sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+ XATTR_SECURITY_PREFIX_LEN) &&
!capable(CAP_SYS_ADMIN))
return -EPERM;
return 0;
@@ -684,7 +684,7 @@ int cap_inode_removexattr(struct dentry *dentry, const char *name)
}

if (!strncmp(name, XATTR_SECURITY_PREFIX,
- sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+ XATTR_SECURITY_PREFIX_LEN) &&
!capable(CAP_SYS_ADMIN))
return -EPERM;
return 0;
--
2.4.10

2016-01-05 17:14:12

by Jan Kara

Subject: Re: [PATCH 1/2] ext4: use XATTR_*_PREFIX_LEN instead sizeof(...)

On Sun 03-01-16 20:56:37, Toralf F?rster wrote:
> use the definition in include/uapi/linux/xattr.h
>
> Signed-off-by: Toralf F?rster <[email protected]>

Looks good. You can add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/ext4/xattr_security.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
> index 36f4c1a..1a3d629 100644
> --- a/fs/ext4/xattr_security.c
> +++ b/fs/ext4/xattr_security.c
> @@ -16,7 +16,7 @@ ext4_xattr_security_list(const struct xattr_handler *handler,
> struct dentry *dentry, char *list, size_t list_size,
> const char *name, size_t name_len)
> {
> - const size_t prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
> + const size_t prefix_len = XATTR_SECURITY_PREFIX_LEN;
> const size_t total_len = prefix_len + name_len + 1;
>
>
> --
> 2.4.10
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <[email protected]>
SUSE Labs, CR

2016-01-06 09:20:58

by José Bollo

Subject: Re: [PATCH 1/2] ext4: use XATTR_*_PREFIX_LEN instead sizeof(...)

I prefer the use of sizeof that can't be faked even by error but why not

Le dimanche 03 janvier 2016 à 20:56 +0100, Toralf Förster a écrit :
> use the definition in include/uapi/linux/xattr.h
>
> Signed-off-by: Toralf Förster <[email protected]>
> ---
> fs/ext4/xattr_security.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
> index 36f4c1a..1a3d629 100644
> --- a/fs/ext4/xattr_security.c
> +++ b/fs/ext4/xattr_security.c
> @@ -16,7 +16,7 @@ ext4_xattr_security_list(const struct xattr_handler *handler,
> struct dentry *dentry, char *list, size_t list_size,
> const char *name, size_t name_len)
> {
> - const size_t prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
> + const size_t prefix_len = XATTR_SECURITY_PREFIX_LEN;
> const size_t total_len = prefix_len + name_len + 1;
>
>