diff options
| author | Bongsu Jeon <bongsu.jeon@samsung.com> | 2021-08-17 16:28:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-18 14:42:13 +0300 |
| commit | e0921e72be17b5b9cf90573327da9a5beac03bbb (patch) | |
| tree | 3edd0ed5aed8e03eedf01ea4bfd8a632f246586b /tools | |
| parent | 0a3332470ca1ba6cb9d1ecac2817f8dde4a190e6 (diff) | |
| download | linux-e0921e72be17b5b9cf90573327da9a5beac03bbb.tar.xz | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/nci/nci_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/nci/nci_dev.c b/tools/testing/selftests/nci/nci_dev.c index 57b505cb1561..9687100f15ea 100644 --- 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; |