Commit 5fe37572 authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by Paul Moore
Browse files

selinux: Use struct_size() helper in kmalloc() 

Make use of struct_size() helper instead of an open-coded calculation.

Link: https://github.com/KSPP/linux/issues/160


Signed-off-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 6326948f

security/selinux/ss/sidtab.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ void sidtab_sid2str_put(struct sidtab *s, struct sidtab_entry *entry, 
		goto out_unlock;

	}



	cache = kmalloc(sizeof(struct sidtab_str_cache) + str_len, GFP_ATOMIC);

	cache = kmalloc(struct_size(cache, str, str_len), GFP_ATOMIC);

	if (!cache)

		goto out_unlock;

security/selinux/xfrm.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int selinux_xfrm_alloc_user(struct xfrm_sec_ctx **ctxp, 
	if (str_len >= PAGE_SIZE)

		return -ENOMEM;



	ctx = kmalloc(sizeof(*ctx) + str_len + 1, gfp);

	ctx = kmalloc(struct_size(ctx, ctx_str, str_len + 1), gfp);

	if (!ctx)

		return -ENOMEM;
@@ -360,7 +360,7 @@ int selinux_xfrm_state_alloc_acquire(struct xfrm_state *x, 
	if (rc)

		return rc;



	ctx = kmalloc(sizeof(*ctx) + str_len, GFP_ATOMIC);

	ctx = kmalloc(struct_size(ctx, ctx_str, str_len), GFP_ATOMIC);

	if (!ctx) {

		rc = -ENOMEM;

		goto out;