Fix CVE-2014-8767, CVE-2014-8768, CVE-2014-8769 and CVE-2014-9140

Signed-off-by: Pasi Sjöholm <pasi.sjoholm@jollamobile.com>
tigeli · Dec 9, 2014 · 5c6f0c3 · 5c6f0c3
1 parent 73262f4
commit 5c6f0c3
Show file tree

Hide file tree

Showing 5 changed files with 430 additions and 381 deletions.
diff --git a/aodv.h b/aodv.h
@@ -134,13 +134,6 @@ struct aodv_rerr {
 	u_int8_t	rerr_flags;	/* various flags */
 	u_int8_t	rerr_zero0;	/* reserved, set to zero */
 	u_int8_t	rerr_dc;	/* destination count */
-	union {
-		struct	rerr_unreach dest[1];
-#ifdef INET6
-		struct	rerr_unreach6 dest6[1];
-		struct	rerr_unreach6_draft_01 dest6_draft_01[1];
-#endif
-	} r;
 };
 
 #define RERR_NODELETE		0x80	/* don't delete the link */
@@ -151,19 +144,6 @@ struct aodv_rrep_ack {
 	u_int8_t	ra_zero0;
 };
 
-union aodv {
-	struct aodv_rreq rreq;
-	struct aodv_rrep rrep;
-	struct aodv_rerr rerr;
-	struct aodv_rrep_ack rrep_ack;
-#ifdef INET6
-	struct aodv_rreq6 rreq6;
-	struct aodv_rreq6_draft_01 rreq6_draft_01;
-	struct aodv_rrep6 rrep6;
-	struct aodv_rrep6_draft_01 rrep6_draft_01;
-#endif
-};
-
 #define	AODV_RREQ		1	/* route request */
 #define	AODV_RREP		2	/* route response */
 #define	AODV_RERR		3	/* error report */