From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Phil Sutter <phil@nwl.cc>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [iptables PATCH 4/4] nft: Fix EPERM handling for extensions without rev 0
Date: Wed, 4 May 2022 22:17:21 +0200 [thread overview]
Message-ID: <YnLfUU8V2G9pY1H7@salvia> (raw)
In-Reply-To: <20220504103416.19712-5-phil@nwl.cc>
On Wed, May 04, 2022 at 12:34:16PM +0200, Phil Sutter wrote:
> Treating revision 0 as compatible in EPERM case works fine as long as
> there is a revision 0 of that extension defined in DSO. Fix the code for
> others: Extend the EPERM handling to all revisions and keep the existing
> warning for revision 0.
>
> Fixes: 17534cb18ed0a ("Improve error messages for unsupported extensions")
> Signed-off-by: Phil Sutter <phil@nwl.cc>
> ---
> iptables/nft.c | 14 ++++++++++----
> .../shell/testcases/iptables/0008-unprivileged_0 | 6 ++++++
> 2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/iptables/nft.c b/iptables/nft.c
> index 33813ce1b9202..95e6c222682c0 100644
> --- a/iptables/nft.c
> +++ b/iptables/nft.c
> @@ -3510,15 +3510,21 @@ int nft_compatible_revision(const char *name, uint8_t rev, int opt)
> err:
> mnl_socket_close(nl);
>
> - /* pretend revision 0 is valid -
> + /* ignore EPERM and errors for revision 0 -
> * this is required for printing extension help texts as user, also
> * helps error messaging on unavailable kernel extension */
> - if (ret < 0 && rev == 0) {
> - if (errno != EPERM)
> + if (ret < 0) {
> + if (errno == EPERM) {
> + fprintf(stderr,
> + "%s: Could not determine whether revision %u is supported, assuming it is.\n",
I'm not sure the user can do much about this error message, to me the
revisions concept are developer-only, I don't think we expose this
implementation detail in the documentation.
Why warn users in this case?
> + name, rev);
> + return 1;
> + } else if (rev == 0) {
> fprintf(stderr,
> "Warning: Extension %s revision 0 not supported, missing kernel module?\n",
> name);
> - return 1;
> + return 1;
> + }
> }
>
> return ret < 0 ? 0 : 1;
> diff --git a/iptables/tests/shell/testcases/iptables/0008-unprivileged_0 b/iptables/tests/shell/testcases/iptables/0008-unprivileged_0
> index 43e3bc8721dbd..983531fef4720 100755
> --- a/iptables/tests/shell/testcases/iptables/0008-unprivileged_0
> +++ b/iptables/tests/shell/testcases/iptables/0008-unprivileged_0
> @@ -35,6 +35,12 @@ let "rc+=$?"
> grep_or_rc "DNAT target options:" <<< "$out"
> let "rc+=$?"
>
> +# TEE has no revision 0
> +out=$(run $XT_MULTI iptables -j TEE --help)
> +let "rc+=$?"
> +grep_or_rc "TEE target options:" <<< "$out"
> +let "rc+=$?"
> +
> out=$(run $XT_MULTI iptables -p tcp -j DNAT --help)
> let "rc+=$?"
> grep_or_rc "tcp match options:" <<< "$out"
> --
> 2.34.1
>
next prev parent reply other threads:[~2022-05-04 20:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 10:34 [iptables PATCH 0/4] Some misc fixes Phil Sutter
2022-05-04 10:34 ` [iptables PATCH 1/4] extensions: DNAT: Merge core printing functions Phil Sutter
2022-05-04 10:34 ` [iptables PATCH 2/4] man: *NAT: Review --random* option descriptions Phil Sutter
2022-05-04 10:34 ` [iptables PATCH 3/4] extensions: LOG: Document --log-macdecode in man page Phil Sutter
2022-05-04 10:34 ` [iptables PATCH 4/4] nft: Fix EPERM handling for extensions without rev 0 Phil Sutter
2022-05-04 20:17 ` Pablo Neira Ayuso [this message]
2022-05-05 12:09 ` Phil Sutter
2022-05-05 13:30 ` Pablo Neira Ayuso
2022-05-06 11:43 ` [iptables PATCH v2 " Phil Sutter
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=YnLfUU8V2G9pY1H7@salvia \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.