From: Jakub Kicinski <kuba@kernel.org>
To: Hoang Le <hoang.h.le@dektech.com.au>
Cc: jmaloy@redhat.com, maloy@donjonn.com, ying.xue@windriver.com,
tung.q.nguyen@dektech.com.au, pabeni@redhat.com,
edumazet@google.com, tipc-discussion@lists.sourceforge.net,
netdev@vger.kernel.org, davem@davemloft.net,
syzbot+a73d24a22eeeebe5f244@syzkaller.appspotmail.com
Subject: Re: [net] tipc: fix uninit-value in tipc_nl_node_reset_link_stats
Date: Wed, 6 Jul 2022 13:33:34 -0700 [thread overview]
Message-ID: <20220706133334.0a6acab5@kernel.org> (raw)
In-Reply-To: <20220706034752.5729-1-hoang.h.le@dektech.com.au>
On Wed, 6 Jul 2022 10:47:52 +0700 Hoang Le wrote:
> diff --git a/net/tipc/node.c b/net/tipc/node.c
> index b48d97cbbe29..80885780caa2 100644
> --- a/net/tipc/node.c
> +++ b/net/tipc/node.c
> @@ -2574,8 +2574,10 @@ int tipc_nl_node_reset_link_stats(struct sk_buff *skb, struct genl_info *info)
> if (!attrs[TIPC_NLA_LINK_NAME])
> return -EINVAL;
>
> - link_name = nla_data(attrs[TIPC_NLA_LINK_NAME]);
> + if (nla_len(attrs[TIPC_NLA_LINK_NAME]) <= 0)
> + return -EINVAL;
>
> + link_name = nla_data(attrs[TIPC_NLA_LINK_NAME]);
> err = -EINVAL;
> if (!strcmp(link_name, tipc_bclink_name)) {
> err = tipc_bclink_reset_stats(net, tipc_bc_sndlink(net));
I think you misunderstood me. Let me try to explain in more detail.
AFAICT the attrs in this function get validated using the
tipc_nl_link_policy:
https://elixir.bootlin.com/linux/v5.19-rc4/source/net/tipc/node.c#L2567
This policy specifies the type for TIPC_NLA_LINK_NAME as NLA_STRING:
https://elixir.bootlin.com/linux/v5.19-rc4/source/net/tipc/netlink.c#L91
Therefore we can assume that the attribute is a valid (but not
necessarily null-terminated) string. Otherwise
nla_parse_nested_deprecated() would have returned an error.
The code for NLA_STRING validation is here:
https://elixir.bootlin.com/linux/v5.19-rc4/source/lib/nlattr.c#L437
So we can already assume that the attribute is not empty.
The bug you're fixing is that the string is not null-terminated,
so strcmp() can read past the end of the attribute.
What I was trying to suggest is that you change the policy from
NLA_STRING to NLA_NUL_STRING, which also checks that the string
is NULL-terminated.
Please note that it'd be a slight uAPI change, and could break
applications which expect kernel to not require null-termination.
Perhaps tipc developers can guide us on how likely that is.
Alternative is to use strncmp(..., nla_len(attr)).
next prev parent reply other threads:[~2022-07-06 20:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 3:47 [net] tipc: fix uninit-value in tipc_nl_node_reset_link_stats Hoang Le
2022-07-06 20:33 ` Jakub Kicinski [this message]
2022-07-06 20:34 ` Jakub Kicinski
2022-07-07 0:22 ` Hoang Huu Le
2022-07-07 0:57 ` Jakub Kicinski
2022-07-07 6:36 ` Hoang Huu Le
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=20220706133334.0a6acab5@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hoang.h.le@dektech.com.au \
--cc=jmaloy@redhat.com \
--cc=maloy@donjonn.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syzbot+a73d24a22eeeebe5f244@syzkaller.appspotmail.com \
--cc=tipc-discussion@lists.sourceforge.net \
--cc=tung.q.nguyen@dektech.com.au \
--cc=ying.xue@windriver.com \
/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).