[17/46] selinux: Delete an unnecessary variable assignment in filename_trans_read()

Commit Message

SF Markus Elfring Jan. 15, 2017, 3:17 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Sat, 14 Jan 2017 19:02:42 +0100

The local variable "ft" was set to a null pointer despite of an
immediate reassignment.
Thus remove this statement from the beginning of a loop.

Signed-off-by: Markus Elfring <[e-mail]>
---
 security/selinux/ss/policydb.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Paul Moore March 23, 2017, 10:09 p.m. UTC | #1

On Sun, Jan 15, 2017 at 10:17 AM, SF Markus Elfring
<[e-mail]> wrote:
> From: Markus Elfring <[e-mail]>
> Date: Sat, 14 Jan 2017 19:02:42 +0100
>
> The local variable "ft" was set to a null pointer despite of an
> immediate reassignment.
> Thus remove this statement from the beginning of a loop.
>
> Signed-off-by: Markus Elfring <[e-mail]>
> ---
>  security/selinux/ss/policydb.c | 1 -
>  1 file changed, 1 deletion(-)

Merged, thanks.

> diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
> index 106a1da1d68a..2be5b18eb149 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1927,7 +1927,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
>         nel = le32_to_cpu(buf[0]);
>
>         for (i = 0; i < nel; i++) {
> -               ft = NULL;
>                 otype = NULL;
>                 name = NULL;
>                 ft = kzalloc(sizeof(*ft), GFP_KERNEL);
> --
> 2.11.0
>

Patch

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 106a1da1d68a..2be5b18eb149 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1927,7 +1927,6 @@  static int filename_trans_read(struct policydb *p, void *fp)
 	nel = le32_to_cpu(buf[0]);
 
 	for (i = 0; i < nel; i++) {
-		ft = NULL;
 		otype = NULL;
 		name = NULL;
 		ft = kzalloc(sizeof(*ft), GFP_KERNEL);