From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Thomas Haller <thaller@redhat.com>
Cc: NetFilter <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH nft 1/2] utils: add memory_allocation_check() helper
Date: Thu, 9 Nov 2023 16:24:09 +0100 [thread overview]
Message-ID: <ZUz5mWjHQjXkU6If@calendula> (raw)
In-Reply-To: <20231108182431.4005745-1-thaller@redhat.com>
On Wed, Nov 08, 2023 at 07:24:24PM +0100, Thomas Haller wrote:
> libnftables kills the process on out of memory (xmalloc()), so
> when we use libraries that propagate ENOMEM to libnftables, we
> also abort the process.
>
> For example:
>
> nlr = nftnl_rule_alloc();
> if (!nlr)
> memory_allocation_error();
>
> Add memory_allocation_check() macro which can simplify this common
> check to:
>
> nlr = memory_allocation_check(nftnl_rule_alloc());
>
> Signed-off-by: Thomas Haller <thaller@redhat.com>
> ---
> include/utils.h | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/include/utils.h b/include/utils.h
> index 36a28f893667..fcd7c598fe9f 100644
> --- a/include/utils.h
> +++ b/include/utils.h
> @@ -142,6 +142,16 @@ extern void __memory_allocation_error(const char *filename, uint32_t line) __nor
> #define memory_allocation_error() \
> __memory_allocation_error(__FILE__, __LINE__);
>
> +#define memory_allocation_check(cmd) \
> + ({ \
> + typeof((cmd)) _v = (cmd); \
> + const void *const _v2 = _v; \
> + \
> + if (!_v2) \
please don't hide a if branch inside a macro.
> + memory_allocation_error(); \
> + _v; \
> + })
> +
> extern void xfree(const void *ptr);
> extern void *xmalloc(size_t size);
> extern void *xmalloc_array(size_t nmemb, size_t size);
> --
> 2.41.0
>
next prev parent reply other threads:[~2023-11-09 15:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-08 18:24 [PATCH nft 1/2] utils: add memory_allocation_check() helper Thomas Haller
2023-11-08 18:24 ` [PATCH nft 2/2] netlink: add and use _nftnl_udata_buf_alloc() helper Thomas Haller
2023-11-09 15:14 ` Pablo Neira Ayuso
2023-11-09 15:19 ` Thomas Haller
2023-11-09 15:32 ` Pablo Neira Ayuso
2023-11-09 16:48 ` Thomas Haller
2023-11-09 19:12 ` Pablo Neira Ayuso
2023-11-09 15:24 ` Pablo Neira Ayuso [this message]
2023-11-09 17:02 ` [PATCH nft 1/2] utils: add memory_allocation_check() helper Thomas Haller
2023-11-15 8:52 ` Florian Westphal
2023-11-15 9:06 ` Thomas Haller
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=ZUz5mWjHQjXkU6If@calendula \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=thaller@redhat.com \
/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