From: Prashant Bhole <prashantbhole.linux@gmail.com> To: "David S . Miller" <davem@davemloft.net>, "Michael S . Tsirkin" <mst@redhat.com> Cc: Prashant Bhole <prashantbhole.linux@gmail.com>, Jason Wang <jasowang@redhat.com>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Jakub Kicinski <jakub.kicinski@netronome.com>, Jesper Dangaard Brouer <hawk@kernel.org>, John Fastabend <john.fastabend@gmail.com>, Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>, netdev@vger.kernel.org, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [RFC net-next 04/18] tuntap: check tun_msg_ctl type at necessary places Date: Tue, 26 Nov 2019 19:07:30 +0900 [thread overview] Message-ID: <20191126100744.5083-5-prashantbhole.linux@gmail.com> (raw) In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> tun_msg_ctl is used by vhost_net to communicate with tuntap. We will introduce another type in soon. As a preparation this patch adds conditions to check tun_msg_ctl type at necessary places. Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com> --- drivers/net/tap.c | 7 +++++-- drivers/net/tun.c | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 3ae70c7e6860..4df7bf00af66 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1213,6 +1213,7 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, struct tap_queue *q = container_of(sock, struct tap_queue, sock); struct tun_msg_ctl *ctl = m->msg_control; struct xdp_buff *xdp; + void *ptr = NULL; int i; if (ctl && (ctl->type == TUN_MSG_PTR)) { @@ -1223,8 +1224,10 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, return 0; } - return tap_get_user(q, ctl ? ctl->ptr : NULL, &m->msg_iter, - m->msg_flags & MSG_DONTWAIT); + if (ctl && ctl->type == TUN_MSG_UBUF) + ptr = ctl->ptr; + + return tap_get_user(q, ptr, &m->msg_iter, m->msg_flags & MSG_DONTWAIT); } static int tap_recvmsg(struct socket *sock, struct msghdr *m, diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 683d371e6e82..1e436d9ec4e1 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2529,6 +2529,7 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) struct tun_struct *tun = tun_get(tfile); struct tun_msg_ctl *ctl = m->msg_control; struct xdp_buff *xdp; + void *ptr = NULL; if (!tun) return -EBADFD; @@ -2560,7 +2561,10 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) goto out; } - ret = tun_get_user(tun, tfile, ctl ? ctl->ptr : NULL, &m->msg_iter, + if (ctl && ctl->type == TUN_MSG_UBUF) + ptr = ctl->ptr; + + ret = tun_get_user(tun, tfile, ptr, &m->msg_iter, m->msg_flags & MSG_DONTWAIT, m->msg_flags & MSG_MORE); out: -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Prashant Bhole <prashantbhole.linux@gmail.com> To: "David S . Miller" <davem@davemloft.net>, "Michael S . Tsirkin" <mst@redhat.com> Cc: Song Liu <songliubraving@fb.com>, Jakub Kicinski <jakub.kicinski@netronome.com>, Jesper Dangaard Brouer <hawk@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, netdev@vger.kernel.org, Jason Wang <jasowang@redhat.com>, John Fastabend <john.fastabend@gmail.com>, Alexei Starovoitov <ast@kernel.org>, qemu-devel@nongnu.org, Prashant Bhole <prashantbhole.linux@gmail.com>, kvm@vger.kernel.org, Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>, Martin KaFai Lau <kafai@fb.com> Subject: [RFC net-next 04/18] tuntap: check tun_msg_ctl type at necessary places Date: Tue, 26 Nov 2019 19:07:30 +0900 [thread overview] Message-ID: <20191126100744.5083-5-prashantbhole.linux@gmail.com> (raw) In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> tun_msg_ctl is used by vhost_net to communicate with tuntap. We will introduce another type in soon. As a preparation this patch adds conditions to check tun_msg_ctl type at necessary places. Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com> --- drivers/net/tap.c | 7 +++++-- drivers/net/tun.c | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 3ae70c7e6860..4df7bf00af66 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1213,6 +1213,7 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, struct tap_queue *q = container_of(sock, struct tap_queue, sock); struct tun_msg_ctl *ctl = m->msg_control; struct xdp_buff *xdp; + void *ptr = NULL; int i; if (ctl && (ctl->type == TUN_MSG_PTR)) { @@ -1223,8 +1224,10 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, return 0; } - return tap_get_user(q, ctl ? ctl->ptr : NULL, &m->msg_iter, - m->msg_flags & MSG_DONTWAIT); + if (ctl && ctl->type == TUN_MSG_UBUF) + ptr = ctl->ptr; + + return tap_get_user(q, ptr, &m->msg_iter, m->msg_flags & MSG_DONTWAIT); } static int tap_recvmsg(struct socket *sock, struct msghdr *m, diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 683d371e6e82..1e436d9ec4e1 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2529,6 +2529,7 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) struct tun_struct *tun = tun_get(tfile); struct tun_msg_ctl *ctl = m->msg_control; struct xdp_buff *xdp; + void *ptr = NULL; if (!tun) return -EBADFD; @@ -2560,7 +2561,10 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) goto out; } - ret = tun_get_user(tun, tfile, ctl ? ctl->ptr : NULL, &m->msg_iter, + if (ctl && ctl->type == TUN_MSG_UBUF) + ptr = ctl->ptr; + + ret = tun_get_user(tun, tfile, ptr, &m->msg_iter, m->msg_flags & MSG_DONTWAIT, m->msg_flags & MSG_MORE); out: -- 2.20.1
next prev parent reply other threads:[~2019-11-26 10:08 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-26 10:07 [RFC net-next 00/18] virtio_net XDP offload Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 01/18] bpf: introduce bpf_prog_offload_verifier_setup() Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 02/18] net: core: rename netif_receive_generic_xdp() to do_generic_xdp_core() Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 03/18] net: core: export do_xdp_generic_core() Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole [this message] 2019-11-26 10:07 ` [RFC net-next 04/18] tuntap: check tun_msg_ctl type at necessary places Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 05/18] vhost_net: user tap recvmsg api to access ptr ring Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 06/18] tuntap: remove usage of ptr ring in vhost_net Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 07/18] tun: set offloaded xdp program Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-12-01 16:35 ` David Ahern 2019-12-01 16:35 ` David Ahern 2019-12-02 2:44 ` Jason Wang 2019-12-02 2:44 ` Jason Wang 2019-12-01 16:45 ` David Ahern 2019-12-01 16:45 ` David Ahern 2019-12-02 2:47 ` Jason Wang 2019-12-02 2:47 ` Jason Wang 2019-12-09 0:24 ` Prashant Bhole 2019-12-09 0:24 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 08/18] tun: run offloaded XDP program in Tx path Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-12-01 16:39 ` David Ahern 2019-12-01 16:39 ` David Ahern 2019-12-01 20:56 ` David Miller 2019-12-01 20:56 ` David Miller 2019-12-01 21:40 ` Michael S. Tsirkin 2019-12-01 21:40 ` Michael S. Tsirkin 2019-12-01 21:54 ` David Miller 2019-12-01 21:54 ` David Miller 2019-12-02 2:56 ` Jason Wang 2019-12-02 2:56 ` Jason Wang 2019-12-02 2:45 ` Jason Wang 2019-12-02 2:45 ` Jason Wang 2019-11-26 10:07 ` [RFC net-next 09/18] tun: add a way to inject Tx path packet into Rx path Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 10/18] tun: handle XDP_TX action of offloaded program Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 11/18] tun: run xdp prog when tun is read from file interface Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 12/18] virtio-net: store xdp_prog in device Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 13/18] virtio_net: use XDP attachment helpers Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 14/18] virtio_net: add XDP prog offload infrastructure Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 15/18] virtio_net: implement XDP prog offload functionality Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-27 20:42 ` Michael S. Tsirkin 2019-11-27 20:42 ` Michael S. Tsirkin 2019-11-28 2:53 ` Prashant Bhole 2019-11-28 2:53 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 16/18] bpf: export function __bpf_map_get Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 17/18] virtio_net: implment XDP map offload functionality Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 20:19 ` kbuild test robot 2019-11-26 10:07 ` [RFC net-next 18/18] virtio_net: restrict bpf helper calls from offloaded program Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 20:35 ` [RFC net-next 00/18] virtio_net XDP offload Jakub Kicinski 2019-11-26 20:35 ` Jakub Kicinski 2019-11-27 2:59 ` Jason Wang 2019-11-27 2:59 ` Jason Wang 2019-11-27 19:49 ` Jakub Kicinski 2019-11-27 19:49 ` Jakub Kicinski 2019-11-28 3:41 ` Jason Wang 2019-11-28 3:41 ` Jason Wang 2019-11-27 20:32 ` Michael S. Tsirkin 2019-11-27 20:32 ` Michael S. Tsirkin 2019-11-27 23:40 ` Jakub Kicinski 2019-11-27 23:40 ` Jakub Kicinski 2019-12-02 15:29 ` Michael S. Tsirkin 2019-12-02 15:29 ` Michael S. Tsirkin 2019-11-28 3:32 ` Alexei Starovoitov 2019-11-28 3:32 ` Alexei Starovoitov 2019-11-28 4:18 ` Jason Wang 2019-11-28 4:18 ` Jason Wang 2019-12-01 16:54 ` David Ahern 2019-12-01 16:54 ` David Ahern 2019-12-02 2:48 ` Jason Wang 2019-12-02 2:48 ` Jason Wang
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=20191126100744.5083-5-prashantbhole.linux@gmail.com \ --to=prashantbhole.linux@gmail.com \ --cc=andriin@fb.com \ --cc=ast@kernel.org \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=hawk@kernel.org \ --cc=jakub.kicinski@netronome.com \ --cc=jasowang@redhat.com \ --cc=john.fastabend@gmail.com \ --cc=kafai@fb.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ --cc=songliubraving@fb.com \ --cc=yhs@fb.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.