Commit 74a335a0 authored by Harold Huang's avatar Harold Huang Committed by Jakub Kicinski

tuntap: add sanity checks about msg_controllen in sendmsg

In patch [1], tun_msg_ctl was added to allow pass batched xdp buffers to
tun_sendmsg. Although we donot use msg_controllen in this path, we should
check msg_controllen to make sure the caller pass a valid msg_ctl.

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fe8dd45bb7556246c6b76277b1ba4296c91c2505Reported-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Suggested-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarHarold Huang <baymaxhuang@gmail.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20220303022441.383865-1-baymaxhuang@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fa452e0a
...@@ -1198,7 +1198,8 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, ...@@ -1198,7 +1198,8 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m,
struct xdp_buff *xdp; struct xdp_buff *xdp;
int i; int i;
if (ctl && (ctl->type == TUN_MSG_PTR)) { if (m->msg_controllen == sizeof(struct tun_msg_ctl) &&
ctl && ctl->type == TUN_MSG_PTR) {
for (i = 0; i < ctl->num; i++) { for (i = 0; i < ctl->num; i++) {
xdp = &((struct xdp_buff *)ctl->ptr)[i]; xdp = &((struct xdp_buff *)ctl->ptr)[i];
tap_get_user_xdp(q, xdp); tap_get_user_xdp(q, xdp);
......
...@@ -2501,7 +2501,8 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) ...@@ -2501,7 +2501,8 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
if (!tun) if (!tun)
return -EBADFD; return -EBADFD;
if (ctl && (ctl->type == TUN_MSG_PTR)) { if (m->msg_controllen == sizeof(struct tun_msg_ctl) &&
ctl && ctl->type == TUN_MSG_PTR) {
struct tun_page tpage; struct tun_page tpage;
int n = ctl->num; int n = ctl->num;
int flush = 0, queued = 0; int flush = 0, queued = 0;
......
...@@ -473,6 +473,7 @@ static void vhost_tx_batch(struct vhost_net *net, ...@@ -473,6 +473,7 @@ static void vhost_tx_batch(struct vhost_net *net,
goto signal_used; goto signal_used;
msghdr->msg_control = &ctl; msghdr->msg_control = &ctl;
msghdr->msg_controllen = sizeof(ctl);
err = sock->ops->sendmsg(sock, msghdr, 0); err = sock->ops->sendmsg(sock, msghdr, 0);
if (unlikely(err < 0)) { if (unlikely(err < 0)) {
vq_err(&nvq->vq, "Fail to batch sending packets\n"); vq_err(&nvq->vq, "Fail to batch sending packets\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment