selftests: nci: Fix the code for next nlattr offset

[ Upstream commit 78a7b2a8a0fa31f63ac16ac13601db6ed8259dfc ]

nlattr could have a padding for 4 bytes alignment. So next nla's offset
should be calculated with a padding.

Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/testing/selftests/nci/nci_dev.c b/tools/testing/selftests/nci/nci_dev.c
index 57b505cb15618ea0ff1d8b230c6a4a05fd68e357..9687100f15ea8894d639825897ac748e0a50eab6 100644 (file)
--- a/tools/testing/selftests/nci/nci_dev.c
+++ b/tools/testing/selftests/nci/nci_dev.c
@@ -113,8 +113,8 @@ static int send_cmd_mt_nla(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
                if (nla_len > 0)
                        memcpy(NLA_DATA(na), nla_data[cnt], nla_len[cnt]);
 
-               msg.n.nlmsg_len += NLMSG_ALIGN(na->nla_len);
-               prv_len = na->nla_len;
+               prv_len = NLA_ALIGN(nla_len[cnt]) + NLA_HDRLEN;
+               msg.n.nlmsg_len += prv_len;
        }
 
        buf = (char *)&msg;