Re: [PATCH 27/46] selinux: Move an assignment for the variable "rc" in sens_read()

Paul Moore
2017-03-29T14:53:31Z

On Sun, Jan 15, 2017 at 10:27 AM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 14 Jan 2017 22:02:14 +0100
>
> A local variable was set to an error code in one case before a concrete
> error situation was detected. Thus move the corresponding assignment into
> an if branch to indicate a software failure there.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> security/selinux/ss/policydb.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)

Dropped for reasons previously discussed.

> diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
> index edfcfd3bbc60..3e43556e67b8 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1608,10 +1608,11 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp)
> if (rc)
> goto bad;
>
> - rc = -ENOMEM;
> levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC);
> - if (!levdatum->level)
> + if (!levdatum->level) {
> + rc = -ENOMEM;
> goto bad;
> + }
>
> rc = mls_read_level(levdatum->level, fp);
> if (rc)
> --
> 2.11.0
>

--
paul moore