All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Subject: [libnftables PATCH next-3.14] expr: fix registers datatypes
Date: Fri, 10 Jan 2014 13:07:51 +0100	[thread overview]
Message-ID: <20140110120751.9047.7872.stgit@nfdev.cica.es> (raw)

Registers datatypes must be enum nft_registers.

Pablo Neira says:
<< From the kernel representation point of view, it doesn't make any
sense to have set both sreg and dreg, but we should not make such
assumption from userspace. If the user sets both sreg and dreg, it's
wrong and the kernel should reply -EINVAL so the user knows that it
has to fix its userspace code. This requires a bit more memory in
userspace, but we don't have the memory restrictions that we have in
kernelspace, so a bit more consumption won't harm. >>

So, while at it, delete the meta expr union for registers.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
 src/expr/cmp.c  |    2 +-
 src/expr/meta.c |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 246f22f..ab244ac 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -26,7 +26,7 @@
 
 struct nft_expr_cmp {
 	union nft_data_reg	data;
-	uint8_t			sreg;	/* enum nft_registers */
+	enum nft_registers	sreg;
 	uint8_t			op;	/* enum nft_cmp_ops */
 };
 
diff --git a/src/expr/meta.c b/src/expr/meta.c
index 490d64a..7fd0af1 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -28,10 +28,8 @@
 
 struct nft_expr_meta {
 	uint8_t			key;	/* enum nft_meta_keys */
-	union {
-		uint8_t		dreg;	/* enum nft_registers */
-		uint8_t		sreg;   /* enum nft_registers */
-	};
+	enum nft_registers	dreg;
+	enum nft_registers	sreg;
 };
 
 static int


             reply	other threads:[~2014-01-10 12:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-10 12:07 Arturo Borrero Gonzalez [this message]
2014-01-10 12:42 ` [libnftables PATCH next-3.14] expr: fix registers datatypes Pablo Neira Ayuso

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=20140110120751.9047.7872.stgit@nfdev.cica.es \
    --to=arturo.borrero.glez@gmail.com \
    --cc=netfilter-devel@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 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.