netdev - [iproute PATCH 1/2] tc: m_action: Fix for field init before memset

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 15 Jun 2016 00:26:08 +0200
From:	Phil Sutter <phil@....cc>
To:	Stephen Hemminger <shemming@...cade.com>
Cc:	netdev@...r.kernel.org, Phil Sutter <psutter@...hat.com>
Subject: [iproute PATCH 1/2] tc: m_action: Fix for field init before memset

From: Phil Sutter <psutter@...hat.com>

Initializing req.t.tca_family before setting the whole req object to
zero using memset does not make sense. Instead initialize the field
after calling memset.

Note that this change has no functional effect since AF_UNSPEC is
defined to 0 anyway, so this fix is a purely cosmetic one.

Signed-off-by: Phil Sutter <phil@....cc>
---
 tc/m_action.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tc/m_action.c b/tc/m_action.c
index c416d98a775a6..1b34370f4ec09 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -397,9 +397,8 @@ static int tc_action_gd(int cmd, unsigned int flags, int *argc_p, char ***argv_p
 		char                    buf[MAX_MSG];
 	} req;
 
-	req.t.tca_family = AF_UNSPEC;
-
 	memset(&req, 0, sizeof(req));
+	req.t.tca_family = AF_UNSPEC;
 
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
@@ -502,10 +501,8 @@ static int tc_action_modify(int cmd, unsigned int flags, int *argc_p, char ***ar
 		char                    buf[MAX_MSG];
 	} req;
 
-	req.t.tca_family = AF_UNSPEC;
-
 	memset(&req, 0, sizeof(req));
-
+	req.t.tca_family = AF_UNSPEC;
 	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg));
 	req.n.nlmsg_flags = NLM_F_REQUEST|flags;
 	req.n.nlmsg_type = cmd;
@@ -541,10 +538,8 @@ static int tc_act_list_or_flush(int argc, char **argv, int event)
 		char                    buf[MAX_MSG];
 	} req;
 
-	req.t.tca_family = AF_UNSPEC;
-
 	memset(&req, 0, sizeof(req));
-
+	req.t.tca_family = AF_UNSPEC;
 	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg));
 
 	tail = NLMSG_TAIL(&req.n);
-- 
2.8.2