lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 320/432] selftests: nci: Fix the code for next nlattr offset
    Date
    From: Bongsu Jeon <bongsu.jeon@samsung.com>

    [ 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>
    ---
    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 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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-16 20:08    [W:5.231 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site