Patchwork [iproute] ipxfrm: simplify algo code a bit

login
register
mail settings
Submitter Mike Frysinger
Date Jan. 18, 2013, 2:39 a.m.
Message ID <1358476746-10810-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/213445/
State Rejected
Delegated to: stephen hemminger
Headers show

Comments

Mike Frysinger - Jan. 18, 2013, 2:39 a.m.
The current code sets up a structure with xfrm_algo embedded in it, but
doesn't use the supplemental key field.  Drop it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
note: i don't have a system where this code runs (probably missing options in
my kernel).  i checked xfrm_aead_print a bit but couldn't quite figure it out.
it doesn't seem like it needs that trailing space.

 ip/ipxfrm.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)
David Miller - Jan. 18, 2013, 3:26 a.m.
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 17 Jan 2013 21:39:06 -0500

> The current code sets up a structure with xfrm_algo embedded in it, but
> doesn't use the supplemental key field.  Drop it.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

It's for the storage of the zero length array at the end of
xfrm_algo.

Don't change code you don't understand.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mike Frysinger - Jan. 18, 2013, 4 a.m.
On Thursday 17 January 2013 22:26:46 David Miller wrote:
> From: Mike Frysinger <vapier@gentoo.org>
> Date: Thu, 17 Jan 2013 21:39:06 -0500
> > The current code sets up a structure with xfrm_algo embedded in it, but
> > doesn't use the supplemental key field.  Drop it.
> 
> It's for the storage of the zero length array at the end of
> xfrm_algo.

ok, so we can use alloca instead

> Don't change code you don't understand.

so you're just going to be pointlessly hostile everywhere ?  stop wasting 
time.
-mike

Patch

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index c7b3420..bd313e6 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -555,16 +555,13 @@  static inline void xfrm_algo_print(struct xfrm_algo *algo, int type, int len,
 static void xfrm_aead_print(struct xfrm_algo_aead *algo, int len,
 			    FILE *fp, const char *prefix)
 {
-	struct {
-		struct xfrm_algo algo;
-		char key[algo->alg_key_len / 8];
-	} base;
+	struct xfrm_algo base_algo;
 
-	memcpy(base.algo.alg_name, algo->alg_name, sizeof(base.algo.alg_name));
-	base.algo.alg_key_len = algo->alg_key_len;
-	memcpy(base.algo.alg_key, algo->alg_key, algo->alg_key_len / 8);
+	memcpy(base_algo.alg_name, algo->alg_name, sizeof(base_algo.alg_name));
+	base_algo.alg_key_len = algo->alg_key_len;
+	memcpy(base_algo.alg_key, algo->alg_key, algo->alg_key_len / 8);
 
-	__xfrm_algo_print(&base.algo, XFRMA_ALG_AEAD, len, fp, prefix, 0);
+	__xfrm_algo_print(&base_algo, XFRMA_ALG_AEAD, len, fp, prefix, 0);
 
 	fprintf(fp, " %d", algo->alg_icv_len);
 
@@ -574,16 +571,13 @@  static void xfrm_aead_print(struct xfrm_algo_aead *algo, int len,
 static void xfrm_auth_trunc_print(struct xfrm_algo_auth *algo, int len,
 				  FILE *fp, const char *prefix)
 {
-	struct {
-		struct xfrm_algo algo;
-		char key[algo->alg_key_len / 8];
-	} base;
+	struct xfrm_algo base_algo;
 
-	memcpy(base.algo.alg_name, algo->alg_name, sizeof(base.algo.alg_name));
-	base.algo.alg_key_len = algo->alg_key_len;
-	memcpy(base.algo.alg_key, algo->alg_key, algo->alg_key_len / 8);
+	memcpy(base_algo.alg_name, algo->alg_name, sizeof(base_algo.alg_name));
+	base_algo.alg_key_len = algo->alg_key_len;
+	memcpy(base_algo.alg_key, algo->alg_key, algo->alg_key_len / 8);
 
-	__xfrm_algo_print(&base.algo, XFRMA_ALG_AUTH_TRUNC, len, fp, prefix, 0);
+	__xfrm_algo_print(&base_algo, XFRMA_ALG_AUTH_TRUNC, len, fp, prefix, 0);
 
 	fprintf(fp, " %d", algo->alg_trunc_len);