From: Stephen Smalley <sds@tycho.nsa.gov>
To: Ondrej Mosnacek <omosnace@redhat.com>,
selinux@vger.kernel.org, Paul Moore <paul@paul-moore.com>
Subject: Re: [PATCH v2 1/2] selinux: factor out loop body from filename_trans_read()
Date: Wed, 12 Feb 2020 14:58:06 -0500 [thread overview]
Message-ID: <061968a4-0b64-1692-9ee0-f1f0e3a28353@tycho.nsa.gov> (raw)
In-Reply-To: <20200212112255.105678-2-omosnace@redhat.com>
On 2/12/20 6:22 AM, Ondrej Mosnacek wrote:
> It simplifies cleanup in the error path. This will be extra useful in
> later patch.
>
> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
> ---
> security/selinux/ss/policydb.c | 122 +++++++++++++++++----------------
> 1 file changed, 63 insertions(+), 59 deletions(-)
>
> diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
> index 2aa7f2e1a8e7..981797bfc547 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1880,88 +1880,92 @@ out:
> return rc;
> }
>
> -static int filename_trans_read(struct policydb *p, void *fp)
> +static int filename_trans_read_one(struct policydb *p, void *fp)
> {
> struct filename_trans *ft;
> - struct filename_trans_datum *otype;
> - char *name;
> - u32 nel, len;
> + struct filename_trans_datum *otype = NULL;
> + char *name = NULL;
> + u32 len;
> __le32 buf[4];
> - int rc, i;
> + int rc;
>
> - if (p->policyvers < POLICYDB_VERSION_FILENAME_TRANS)
> - return 0;
> + ft = kzalloc(sizeof(*ft), GFP_KERNEL);
> + if (!ft)
> + return -ENOMEM;
> +
> + rc = -ENOMEM;
> + otype = kmalloc(sizeof(*otype), GFP_KERNEL);
> + if (!otype)
> + goto out;
>
> + /* length of the path component string */
> rc = next_entry(buf, fp, sizeof(u32));
> if (rc)
> - return rc;
> - nel = le32_to_cpu(buf[0]);
> -
> - for (i = 0; i < nel; i++) {
> - otype = NULL;
> - name = NULL;
> -
> - rc = -ENOMEM;
> - ft = kzalloc(sizeof(*ft), GFP_KERNEL);
> - if (!ft)
> - goto out;
> -
> - rc = -ENOMEM;
> - otype = kmalloc(sizeof(*otype), GFP_KERNEL);
> - if (!otype)
> - goto out;
> -
> - /* length of the path component string */
> - rc = next_entry(buf, fp, sizeof(u32));
> - if (rc)
> - goto out;
> - len = le32_to_cpu(buf[0]);
> + goto out;
> + len = le32_to_cpu(buf[0]);
>
> - /* path component string */
> - rc = str_read(&name, GFP_KERNEL, fp, len);
> - if (rc)
> - goto out;
> + /* path component string */
> + rc = str_read(&name, GFP_KERNEL, fp, len);
> + if (rc)
> + goto out;
>
> - ft->name = name;
> + ft->name = name;
>
> - rc = next_entry(buf, fp, sizeof(u32) * 4);
> - if (rc)
> - goto out;
> + rc = next_entry(buf, fp, sizeof(u32) * 4);
> + if (rc)
> + goto out;
>
> - ft->stype = le32_to_cpu(buf[0]);
> - ft->ttype = le32_to_cpu(buf[1]);
> - ft->tclass = le32_to_cpu(buf[2]);
> + ft->stype = le32_to_cpu(buf[0]);
> + ft->ttype = le32_to_cpu(buf[1]);
> + ft->tclass = le32_to_cpu(buf[2]);
>
> - otype->otype = le32_to_cpu(buf[3]);
> + otype->otype = le32_to_cpu(buf[3]);
>
> - rc = ebitmap_set_bit(&p->filename_trans_ttypes, ft->ttype, 1);
> - if (rc)
> - goto out;
> + rc = ebitmap_set_bit(&p->filename_trans_ttypes, ft->ttype, 1);
> + if (rc)
> + goto out;
>
> - rc = hashtab_insert(p->filename_trans, ft, otype);
> - if (rc) {
> - /*
> - * Do not return -EEXIST to the caller, or the system
> - * will not boot.
> - */
> - if (rc != -EEXIST)
> - goto out;
> - /* But free memory to avoid memory leak. */
> - kfree(ft);
> - kfree(name);
> - kfree(otype);
> - }
> + rc = hashtab_insert(p->filename_trans, ft, otype);
> + if (rc) {
> + /*
> + * Do not return -EEXIST to the caller, or the system
> + * will not boot.
> + */
> + if (rc == -EEXIST)
> + rc = 0;
> + goto out;
> }
> - hash_eval(p->filename_trans, "filenametr");
> return 0;
> out:
> kfree(ft);
> kfree(name);
> kfree(otype);
> -
> return rc;
> }
>
> +static int filename_trans_read(struct policydb *p, void *fp)
> +{
> + u32 nel;
> + __le32 buf[1];
> + int rc, i;
> +
> + if (p->policyvers < POLICYDB_VERSION_FILENAME_TRANS)
> + return 0;
> +
> + rc = next_entry(buf, fp, sizeof(u32));
> + if (rc)
> + return rc;
> + nel = le32_to_cpu(buf[0]);
> +
> + for (i = 0; i < nel; i++) {
> + rc = filename_trans_read_one(p, fp);
> + if (rc)
> + return rc;
> + }
> + hash_eval(p->filename_trans, "filenametr");
> + return 0;
> +}
> +
> static int genfs_read(struct policydb *p, void *fp)
> {
> int i, j, rc;
>
next prev parent reply other threads:[~2020-02-12 20:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 11:22 [PATCH v2 0/2] Optimize storage of filename transitions Ondrej Mosnacek
2020-02-12 11:22 ` [PATCH v2 1/2] selinux: factor out loop body from filename_trans_read() Ondrej Mosnacek
2020-02-12 19:58 ` Stephen Smalley [this message]
2020-02-13 23:10 ` Paul Moore
2020-02-12 11:22 ` [PATCH v2 2/2] selinux: optimize storage of filename transitions Ondrej Mosnacek
2020-02-12 19:58 ` Stephen Smalley
2020-02-14 0:35 ` Paul Moore
2020-02-14 9:12 ` Ondrej Mosnacek
2020-02-17 23:20 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=061968a4-0b64-1692-9ee0-f1f0e3a28353@tycho.nsa.gov \
--to=sds@tycho.nsa.gov \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).