From: Yongseok Koh <yskoh@mellanox.com>
To: Jiayu Hu <jiayu.hu@intel.com>
Cc: "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [PATCH 17.11] gro: fix overflow of TCP payload calculation
Date: Wed, 9 Jan 2019 09:30:07 +0000 [thread overview]
Message-ID: <F063B93D-6AF4-49CC-9F0A-B605F66291B4@mellanox.com> (raw)
In-Reply-To: <1547000450-113783-1-git-send-email-jiayu.hu@intel.com>
> On Jan 8, 2019, at 6:20 PM, Jiayu Hu <jiayu.hu@intel.com> wrote:
>
> When the IPv4 packet length is less than the total length of IPv4
> and TCP headers, the calculated TCP payload length will overflow
> and result in incorrect reassembly behaviors.
>
> Fixes: 0d2cbe59b719 ("lib/gro: support TCP/IPv4")
>
> Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
> ---
Applied to stable/17.11
Thanks,
Yongseok
> lib/librte_gro/gro_tcp4.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c
> index 61a0423..d1c6c7d 100644
> --- a/lib/librte_gro/gro_tcp4.c
> +++ b/lib/librte_gro/gro_tcp4.c
> @@ -343,7 +343,8 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
> struct ipv4_hdr *ipv4_hdr;
> struct tcp_hdr *tcp_hdr;
> uint32_t sent_seq;
> - uint16_t tcp_dl, ip_id;
> + uint16_t ip_id;
> + int32_t tcp_dl;
>
> struct tcp4_key key;
> uint32_t cur_idx, prev_idx, item_idx;
> @@ -360,10 +361,10 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
> */
> if (tcp_hdr->tcp_flags != TCP_ACK_FLAG)
> return -1;
> - /* if payload length is 0, return immediately */
> + /* if payload length is less than or equal to 0, return immediately */
> tcp_dl = rte_be_to_cpu_16(ipv4_hdr->total_length) - pkt->l3_len -
> pkt->l4_len;
> - if (tcp_dl == 0)
> + if (tcp_dl <= 0)
> return -1;
>
> ip_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);
> --
> 2.7.4
>
prev parent reply other threads:[~2019-01-09 9:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 2:20 Jiayu Hu
2019-01-09 9:30 ` Yongseok Koh [this message]
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=F063B93D-6AF4-49CC-9F0A-B605F66291B4@mellanox.com \
--to=yskoh@mellanox.com \
--cc=jiayu.hu@intel.com \
--cc=stable@dpdk.org \
/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).