From: James Carter <jwcart2@gmail.com>
To: selinux@vger.kernel.org
Subject: Re: [PATCH] libselinux: Fix ordering of arguments to calloc
Date: Thu, 25 Jan 2024 14:58:14 -0500 [thread overview]
Message-ID: <CAP+JOzRkY3xQ6eDxttBVXM0gchNXBXnpD=hAYNTdmz_6wxBFSA@mail.gmail.com> (raw)
In-Reply-To: <20240105201917.2286119-1-jwcart2@gmail.com>
On Fri, Jan 5, 2024 at 3:19 PM James Carter <jwcart2@gmail.com> wrote:
>
> The number of elements should be first and the size of the elements
> second.
>
> Signed-off-by: James Carter <jwcart2@gmail.com>
This patch has been merged.
Jim
> ---
> libselinux/src/audit2why.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libselinux/src/audit2why.c b/libselinux/src/audit2why.c
> index 8c4c07d5..ad846cc3 100644
> --- a/libselinux/src/audit2why.c
> +++ b/libselinux/src/audit2why.c
> @@ -148,7 +148,7 @@ static int check_booleans(struct boolean_t **bools)
> sepol_bool_free(boolean);
>
> if (fcnt > 0) {
> - *bools = calloc(sizeof(struct boolean_t), fcnt + 1);
> + *bools = calloc(fcnt + 1, sizeof(struct boolean_t));
> if (!*bools) {
> PyErr_SetString( PyExc_MemoryError, "Out of memory\n");
> free(foundlist);
> @@ -226,7 +226,7 @@ static int __policy_init(const char *init_path)
> return 1;
> }
>
> - avc = calloc(sizeof(struct avc_t), 1);
> + avc = calloc(1, sizeof(struct avc_t));
> if (!avc) {
> PyErr_SetString( PyExc_MemoryError, "Out of memory\n");
> fclose(fp);
> --
> 2.43.0
>
prev parent reply other threads:[~2024-01-25 19:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 20:19 [PATCH] libselinux: Fix ordering of arguments to calloc James Carter
2024-01-25 19:58 ` James Carter [this message]
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='CAP+JOzRkY3xQ6eDxttBVXM0gchNXBXnpD=hAYNTdmz_6wxBFSA@mail.gmail.com' \
--to=jwcart2@gmail.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 read-only IMAP folder(s) and NNTP newsgroup(s).