From: Eric Dumazet <eric.dumazet at gmail.com>
To: mptcp at lists.01.org
Subject: [MPTCP] Re: [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK
Date: Fri, 13 Dec 2019 15:22:38 -0800 [thread overview]
Message-ID: <47545b88-94db-e9cd-2f9f-2c6d665246e2@gmail.com> (raw)
In-Reply-To: 20191213230022.28144-10-mathew.j.martineau@linux.intel.com
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
On 12/13/19 3:00 PM, Mat Martineau wrote:
> The SACK code would potentially add four bytes to the expected
> TCP option size even if all option space was already used.
>
> Signed-off-by: Mat Martineau <mathew.j.martineau(a)linux.intel.com>
> ---
> net/ipv4/tcp_output.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 9e04d45bc0e4..710ab45badfa 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -748,6 +748,9 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb
> size += TCPOLEN_TSTAMP_ALIGNED;
> }
>
> + if (size + TCPOLEN_SACK_BASE_ALIGNED >= MAX_TCP_OPTION_SPACE)
> + return size;
> +
> eff_sacks = tp->rx_opt.num_sacks + tp->rx_opt.dsack;
> if (unlikely(eff_sacks)) {
> const unsigned int remaining = MAX_TCP_OPTION_SPACE - size;
>
Hmmm... I thought I already fixed this issue ?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9424e2e7ad93ffffa88f882c9bc5023570904b55
Please do not mix fixes (targeting net tree) in a patch series targeting net-next
WARNING: multiple messages have this Message-ID (diff)
From: Eric Dumazet <eric.dumazet@gmail.com>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>,
netdev@vger.kernel.org, mptcp@lists.01.org
Subject: Re: [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK
Date: Fri, 13 Dec 2019 15:22:38 -0800 [thread overview]
Message-ID: <47545b88-94db-e9cd-2f9f-2c6d665246e2@gmail.com> (raw)
In-Reply-To: <20191213230022.28144-10-mathew.j.martineau@linux.intel.com>
On 12/13/19 3:00 PM, Mat Martineau wrote:
> The SACK code would potentially add four bytes to the expected
> TCP option size even if all option space was already used.
>
> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> ---
> net/ipv4/tcp_output.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 9e04d45bc0e4..710ab45badfa 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -748,6 +748,9 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb
> size += TCPOLEN_TSTAMP_ALIGNED;
> }
>
> + if (size + TCPOLEN_SACK_BASE_ALIGNED >= MAX_TCP_OPTION_SPACE)
> + return size;
> +
> eff_sacks = tp->rx_opt.num_sacks + tp->rx_opt.dsack;
> if (unlikely(eff_sacks)) {
> const unsigned int remaining = MAX_TCP_OPTION_SPACE - size;
>
Hmmm... I thought I already fixed this issue ?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9424e2e7ad93ffffa88f882c9bc5023570904b55
Please do not mix fixes (targeting net tree) in a patch series targeting net-next
next reply other threads:[~2019-12-13 23:22 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 23:22 Eric Dumazet [this message]
2019-12-13 23:22 ` [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK Eric Dumazet
-- strict thread matches above, loose matches on Subject: below --
2019-12-16 17:28 [MPTCP] " Paolo Abeni
2019-12-16 17:28 ` Paolo Abeni
2019-12-16 16:55 Eric Dumazet
2019-12-16 16:55 ` Eric Dumazet
2019-12-16 12:52 Paolo Abeni
2019-12-16 12:52 ` Paolo Abeni
2019-12-14 0:28 Mat Martineau
2019-12-14 0:28 ` Mat Martineau
2019-12-14 0:06 [MPTCP] Re: [PATCH net-next 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2019-12-14 0:06 ` Mat Martineau
2019-12-13 23:16 [MPTCP] " Eric Dumazet
2019-12-13 23:16 ` Eric Dumazet
2019-12-13 23:00 [MPTCP] [PATCH net-next 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 07/11] tcp: Prevent coalesce/collapse when skb has MPTCP extensions Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 01/11] net: Make sock protocol value checks more specific Mat Martineau
2019-12-13 23:00 ` Mat Martineau
2019-12-13 23:00 [MPTCP] [PATCH net-next 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-13 23:00 ` Mat Martineau
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=47545b88-94db-e9cd-2f9f-2c6d665246e2@gmail.com \
--to=unknown@example.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 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.