linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: bongsu.jeon2@gmail.com
To: shuah@kernel.org, krzysztof.kozlowski@canonical.com
Cc: netdev@vger.kernel.org, linux-nfc@lists.01.org,
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
	Bongsu Jeon <bongsu.jeon@samsung.com>
Subject: [PATCH v2 net-next 4/8] selftests: nci: Fix the code for next nlattr offset
Date: Tue, 17 Aug 2021 06:28:14 -0700	[thread overview]
Message-ID: <20210817132818.8275-5-bongsu.jeon2@gmail.com> (raw)
In-Reply-To: <20210817132818.8275-1-bongsu.jeon2@gmail.com>

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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>
---
 tools/testing/selftests/nci/nci_dev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/nci/nci_dev.c b/tools/testing/selftests/nci/nci_dev.c
index b4d85eeb5fd1..cf47505a6b35 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;
-- 
2.32.0


  parent reply	other threads:[~2021-08-17 13:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-17 13:28 [PATCH v2 net-next 0/8] Update the virtual NCI device driver and add the NCI testcase bongsu.jeon2
2021-08-17 13:28 ` [PATCH v2 net-next 1/8] nfc: virtual_ncidev: Use wait queue instead of polling bongsu.jeon2
2021-08-17 13:28 ` [PATCH v2 net-next 2/8] selftests: nci: Remove the polling code to read a NCI frame bongsu.jeon2
2021-08-17 13:28 ` [PATCH v2 net-next 3/8] selftests: nci: Fix the typo bongsu.jeon2
2021-08-17 13:28 ` bongsu.jeon2 [this message]
2021-08-17 13:28 ` [PATCH v2 net-next 5/8] selftests: nci: Fix the wrong condition bongsu.jeon2
2021-08-17 13:28 ` [PATCH v2 net-next 6/8] selftests: nci: Add the flags parameter for the send_cmd_mt_nla bongsu.jeon2
2021-08-17 13:28 ` [PATCH v2 net-next 7/8] selftests: nci: Extract the start/stop discovery function bongsu.jeon2
2021-08-17 13:28 ` [PATCH v2 net-next 8/8] selftests: nci: Add the NCI testcase reading T4T Tag bongsu.jeon2
2021-08-18  9:40 ` [PATCH v2 net-next 0/8] Update the virtual NCI device driver and add the NCI testcase patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210817132818.8275-5-bongsu.jeon2@gmail.com \
    --to=bongsu.jeon2@gmail.com \
    --cc=bongsu.jeon@samsung.com \
    --cc=krzysztof.kozlowski@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-nfc@lists.01.org \
    --cc=netdev@vger.kernel.org \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).