From: Yafang Shao <laoar.shao@gmail.com>
To: kafai@fb.com, brakmo@fb.com, ast@kernel.org, daniel@iogearbox.net
Cc: netdev@vger.kernel.org, shaoyafang@didiglobal.com,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH v2 bpf-next] bpf: use the proper optlen when doing strncpy in bpf_getsockopt()
Date: Thu, 24 Jan 2019 13:16:34 +0800 [thread overview]
Message-ID: <1548306994-877-1-git-send-email-laoar.shao@gmail.com> (raw)
As strncpy(..., TCP_CA_NAME_MAX-1) is used in bpf_setsockopt(),
this change will make it more consistent with the bpf_setsockopt() above.
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Lawrence Brakmo <brakmo@fb.com>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
net/core/filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/filter.c b/net/core/filter.c
index 447dd1b..7a4de22 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4262,7 +4262,7 @@ static unsigned long bpf_xdp_copy(void *dst_buff, const void *src_buff,
if (!icsk->icsk_ca_ops || optlen <= 1)
goto err_clear;
- strncpy(optval, icsk->icsk_ca_ops->name, optlen);
+ strncpy(optval, icsk->icsk_ca_ops->name, optlen - 1);
optval[optlen - 1] = 0;
break;
case TCP_SAVED_SYN:
--
1.8.3.1
next reply other threads:[~2019-01-24 5:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 5:16 Yafang Shao [this message]
2019-01-24 11:24 ` [PATCH v2 bpf-next] bpf: use the proper optlen when doing strncpy in bpf_getsockopt() Daniel Borkmann
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=1548306994-877-1-git-send-email-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=ast@kernel.org \
--cc=brakmo@fb.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=shaoyafang@didiglobal.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