aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTuong Lien <tuong.t.lien@dektech.com.au>2019-12-30 10:03:33 +0700
committerStephen Hemminger <stephen@networkplumber.org>2020-01-06 13:12:48 -0800
commitd5391e186f04214315a5a80797c78e50ad9f5271 (patch)
treeff5e605ed2e30e94f619786d1b827c675fdb67ad
parentf8bebea915e39e734e82bcf5e16d233dc877c1cf (diff)
downloadiproute2-d5391e186f04214315a5a80797c78e50ad9f5271.tar.gz
tipc: fix clang warning in tipc/node.c
When building tipc with clang, the following warning is found: tipc CC bearer.o CC cmdl.o CC link.o CC media.o CC misc.o CC msg.o CC nametable.o CC node.o node.c:182:24: warning: field 'key' with variable sized type 'struct tipc_aead_key' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end] struct tipc_aead_key key; This commit fixes it by putting the memory area allocated for the user input key along with the variable-sized 'key' structure in the 'union' form instead. Fixes: 24bee3bf9752 ("tipc: add new commands to set TIPC AEAD key") Reported-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: Tuong Lien <tuong.t.lien@dektech.com.au> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-rw-r--r--tipc/node.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tipc/node.c b/tipc/node.c
index 6c796bfba..ffdaeaeab 100644
--- a/tipc/node.c
+++ b/tipc/node.c
@@ -179,8 +179,10 @@ static int cmd_node_set_key(struct nlmsghdr *nlh, const struct cmd *cmd,
struct cmdl *cmdl, void *data)
{
struct {
- struct tipc_aead_key key;
- char mem[TIPC_AEAD_KEYLEN_MAX + 1];
+ union {
+ struct tipc_aead_key key;
+ char mem[TIPC_AEAD_KEY_SIZE_MAX];
+ };
} input = {};
struct opt opts[] = {
{ "algname", OPT_KEYVAL, NULL },