From: "Ananyev, Konstantin" <konstantin.ananyev@intel.com> To: David Marchand <david.marchand@redhat.com>, "Wang, Xiao W" <xiao.w.wang@intel.com> Cc: "Xia, Chenbo" <chenbo.xia@intel.com>, Maxime Coquelin <maxime.coquelin@redhat.com>, "Liu, Yong" <yong.liu@intel.com>, dev <dev@dpdk.org>, dpdk stable <stable@dpdk.org> Subject: Re: [dpdk-stable] [PATCH v2] vhost: add header check in dequeue offload Date: Mon, 15 Mar 2021 18:53:18 +0000 Message-ID: <DM6PR11MB4491E39AC07D9328852492EB9A6C9@DM6PR11MB4491.namprd11.prod.outlook.com> (raw) In-Reply-To: <CAJFAV8zmF=-MhhvQPkWe=EUwS1eAeM-xnaq4J96yD368VL4Dpg@mail.gmail.com> > -----Original Message----- > From: David Marchand <david.marchand@redhat.com> > Sent: Monday, March 15, 2021 4:17 PM > To: Wang, Xiao W <xiao.w.wang@intel.com> > Cc: Xia, Chenbo <chenbo.xia@intel.com>; Maxime Coquelin <maxime.coquelin@redhat.com>; Liu, Yong <yong.liu@intel.com>; dev > <dev@dpdk.org>; Ananyev, Konstantin <konstantin.ananyev@intel.com>; dpdk stable <stable@dpdk.org> > Subject: Re: [dpdk-stable] [PATCH v2] vhost: add header check in dequeue offload > > On Mon, Mar 15, 2021 at 4:52 PM Xiao Wang <xiao.w.wang@intel.com> wrote: > > > > When parsing the virtio net header and packet header for dequeue offload, > > we need to perform sanity check on the packet header to ensure: > > - No out-of-boundary memory access. > > - The packet header and virtio_net header are valid and aligned. > > > > Fixes: d0cf91303d73 ("vhost: add Tx offload capabilities") > > Cc: stable@dpdk.org > > > > Signed-off-by: Xiao Wang <xiao.w.wang@intel.com> > > --- > > v2: > > Allow empty L4 payload for cksum offload. > > --- > > lib/librte_vhost/virtio_net.c | 49 +++++++++++++++++++++++++++++++++++++------ > > 1 file changed, 43 insertions(+), 6 deletions(-) > > > > diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c > > index 583bf379c6..53a8ff2898 100644 > > --- a/lib/librte_vhost/virtio_net.c > > +++ b/lib/librte_vhost/virtio_net.c > > @@ -1821,44 +1821,64 @@ virtio_net_with_host_offload(struct virtio_net *dev) > > return false; > > } > > > > -static void > > -parse_ethernet(struct rte_mbuf *m, uint16_t *l4_proto, void **l4_hdr) > > +static int > > +parse_ethernet(struct rte_mbuf *m, uint16_t *l4_proto, void **l4_hdr, > > + uint16_t *len) > > { > > struct rte_ipv4_hdr *ipv4_hdr; > > struct rte_ipv6_hdr *ipv6_hdr; > > void *l3_hdr = NULL; > > struct rte_ether_hdr *eth_hdr; > > uint16_t ethertype; > > + uint16_t data_len = m->data_len; > > > > > eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); > > > > + if (data_len <= sizeof(struct rte_ether_hdr)) > > + return -EINVAL; > > On principle, the check should happen before calling rte_pktmbuf_mtod, > like what rte_pktmbuf_read does. > > Looking at the rest of the patch, does this helper function only > handle mono segment mbufs? > My reading of copy_desc_to_mbuf() was that it could generate multi > segments mbufs... > > > [snip] > > > case RTE_ETHER_TYPE_IPV4: > > + if (data_len <= sizeof(struct rte_ipv4_hdr)) > > + return -EINVAL; > > ipv4_hdr = l3_hdr; > > *l4_proto = ipv4_hdr->next_proto_id; > > m->l3_len = rte_ipv4_hdr_len(ipv4_hdr); > > + if (data_len <= m->l3_len) { > > + m->l3_len = 0; > > + return -EINVAL; > > + } > > ... so here, comparing l3 length to only the first segment length > (data_len) would be invalid. > > If this helper must deal with multi segments, why not use rte_pktmbuf_read? > This function returns access to mbuf data after checking offset and > length are contiguous, else copy the needed data in a passed buffer. From my understanding, yes multi-seg is allowed, but an expectation Is that at least packet header (l2/l3/l4?) will always reside in first segment. > > > > *l4_hdr = (char *)l3_hdr + m->l3_len; > > m->ol_flags |= PKT_TX_IPV4; > > + data_len -= m->l3_len; > > break; > > > -- > David Marchand
next prev parent reply other threads:[~2021-03-15 18:53 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-11 6:38 [dpdk-stable] [PATCH] " Xiao Wang 2021-03-11 10:38 ` [dpdk-stable] [dpdk-dev] " Ananyev, Konstantin 2021-03-12 15:19 ` Wang, Xiao W 2021-03-15 15:32 ` [dpdk-stable] [PATCH v2] " Xiao Wang 2021-03-15 16:17 ` David Marchand 2021-03-15 18:53 ` Ananyev, Konstantin [this message] 2021-03-16 9:13 ` Wang, Xiao W 2021-03-17 6:31 ` [dpdk-stable] [PATCH v3] " Xiao Wang 2021-04-01 12:04 ` David Marchand 2021-04-02 8:38 ` Wang, Xiao W 2021-04-12 9:08 ` Wang, Xiao W 2021-04-12 9:33 ` David Marchand 2021-04-13 14:30 ` Maxime Coquelin 2021-05-08 5:54 ` Wang, Xiao W 2021-06-15 6:35 ` [dpdk-stable] [PATCH v4] vhost: check header for legacy " Xiao Wang 2021-06-15 7:57 ` [dpdk-stable] [dpdk-dev] " David Marchand 2021-06-16 14:33 ` Wang, Xiao W 2021-06-21 8:21 ` [dpdk-stable] [PATCH v5] " Xiao Wang 2021-07-13 9:34 ` Maxime Coquelin 2021-07-20 2:43 ` Xia, Chenbo
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=DM6PR11MB4491E39AC07D9328852492EB9A6C9@DM6PR11MB4491.namprd11.prod.outlook.com \ --to=konstantin.ananyev@intel.com \ --cc=chenbo.xia@intel.com \ --cc=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=maxime.coquelin@redhat.com \ --cc=stable@dpdk.org \ --cc=xiao.w.wang@intel.com \ --cc=yong.liu@intel.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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git