lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 426/800] mptcp: make sure flag signal is set when add addr with port
    Date
    From: Jianguo Wu <wujianguo@chinatelecom.cn>

    [ Upstream commit eb5fb629f56da3f40f496c807da44a7ce7644779 ]

    When add address with port, it is mean to create a listening socket,
    and send an ADD_ADDR to remote, so it must have flag signal set,
    add this check in mptcp_pm_parse_addr().

    Fixes: a77e9179c7651 ("mptcp: deal with MPTCP_PM_ADDR_ATTR_PORT in PM netlink")
    Acked-by: Geliang Tang <geliangtang@gmail.com>
    Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
    Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn>
    Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mptcp/pm_netlink.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
    index 2469e06a3a9d..3f5d90a20235 100644
    --- a/net/mptcp/pm_netlink.c
    +++ b/net/mptcp/pm_netlink.c
    @@ -971,8 +971,14 @@ skip_family:
    if (tb[MPTCP_PM_ADDR_ATTR_FLAGS])
    entry->flags = nla_get_u32(tb[MPTCP_PM_ADDR_ATTR_FLAGS]);

    - if (tb[MPTCP_PM_ADDR_ATTR_PORT])
    + if (tb[MPTCP_PM_ADDR_ATTR_PORT]) {
    + if (!(entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {
    + NL_SET_ERR_MSG_ATTR(info->extack, attr,
    + "flags must have signal when using port");
    + return -EINVAL;
    + }
    entry->addr.port = htons(nla_get_u16(tb[MPTCP_PM_ADDR_ATTR_PORT]));
    + }

    return 0;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:10    [W:4.024 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site