From: Hangyu Hua <hbh25y@gmail.com> To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ian.mcdonald@jandi.co.nz, gerrit@erg.abdn.ac.uk Cc: dccp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hangyu Hua <hbh25y@gmail.com> Subject: [PATCH] net: dccp: delete redundant ackvec record in dccp_insert_options() Date: Tue, 21 Feb 2023 17:22:06 +0800 [thread overview] Message-ID: <20230221092206.39741-1-hbh25y@gmail.com> (raw) A useless record can be insert into av_records when dccp_insert_options() fails after dccp_insert_option_ackvec(). Repeated triggering may cause av_records to have a lot of useless record with the same avr_ack_seqno. Fixes: 8b7b6c75c638 ("dccp: Integrate feature-negotiation insertion code") Signed-off-by: Hangyu Hua <hbh25y@gmail.com> --- net/dccp/options.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/dccp/options.c b/net/dccp/options.c index d24cad05001e..8aa4abeb15ea 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c @@ -549,6 +549,8 @@ static void dccp_insert_option_padding(struct sk_buff *skb) int dccp_insert_options(struct sock *sk, struct sk_buff *skb) { struct dccp_sock *dp = dccp_sk(sk); + struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec; + struct dccp_ackvec_record *avr; DCCP_SKB_CB(skb)->dccpd_opt_len = 0; @@ -577,16 +579,22 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb) if (dp->dccps_hc_rx_insert_options) { if (ccid_hc_rx_insert_options(dp->dccps_hc_rx_ccid, sk, skb)) - return -1; + goto delete_ackvec; dp->dccps_hc_rx_insert_options = 0; } if (dp->dccps_timestamp_echo != 0 && dccp_insert_option_timestamp_echo(dp, NULL, skb)) - return -1; + goto delete_ackvec; dccp_insert_option_padding(skb); return 0; + +delete_ackvec: + avr = dccp_ackvec_lookup(&av->av_records, DCCP_SKB_CB(skb)->dccpd_seq); + list_del(&avr->avr_node); + kmem_cache_free(dccp_ackvec_record_slab, avr); + return -1; } int dccp_insert_options_rsk(struct dccp_request_sock *dreq, struct sk_buff *skb) -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Hangyu Hua <hbh25y@gmail.com> To: dccp@vger.kernel.org Subject: [PATCH] net: dccp: delete redundant ackvec record in dccp_insert_options() Date: Tue, 21 Feb 2023 09:22:06 +0000 [thread overview] Message-ID: <20230221092206.39741-1-hbh25y@gmail.com> (raw) A useless record can be insert into av_records when dccp_insert_options() fails after dccp_insert_option_ackvec(). Repeated triggering may cause av_records to have a lot of useless record with the same avr_ack_seqno. Fixes: 8b7b6c75c638 ("dccp: Integrate feature-negotiation insertion code") Signed-off-by: Hangyu Hua <hbh25y@gmail.com> --- net/dccp/options.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/dccp/options.c b/net/dccp/options.c index d24cad05001e..8aa4abeb15ea 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c @@ -549,6 +549,8 @@ static void dccp_insert_option_padding(struct sk_buff *skb) int dccp_insert_options(struct sock *sk, struct sk_buff *skb) { struct dccp_sock *dp = dccp_sk(sk); + struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec; + struct dccp_ackvec_record *avr; DCCP_SKB_CB(skb)->dccpd_opt_len = 0; @@ -577,16 +579,22 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb) if (dp->dccps_hc_rx_insert_options) { if (ccid_hc_rx_insert_options(dp->dccps_hc_rx_ccid, sk, skb)) - return -1; + goto delete_ackvec; dp->dccps_hc_rx_insert_options = 0; } if (dp->dccps_timestamp_echo != 0 && dccp_insert_option_timestamp_echo(dp, NULL, skb)) - return -1; + goto delete_ackvec; dccp_insert_option_padding(skb); return 0; + +delete_ackvec: + avr = dccp_ackvec_lookup(&av->av_records, DCCP_SKB_CB(skb)->dccpd_seq); + list_del(&avr->avr_node); + kmem_cache_free(dccp_ackvec_record_slab, avr); + return -1; } int dccp_insert_options_rsk(struct dccp_request_sock *dreq, struct sk_buff *skb) -- 2.34.1
next reply other threads:[~2023-02-21 9:22 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-21 9:22 Hangyu Hua [this message] 2023-02-21 9:22 ` [PATCH] net: dccp: delete redundant ackvec record in dccp_insert_options() Hangyu Hua 2023-02-21 12:46 ` Eric Dumazet 2023-02-21 12:46 ` Eric Dumazet 2023-02-22 2:12 ` Hangyu Hua 2023-02-22 2:12 ` Hangyu Hua 2023-02-21 14:04 ` kernel test robot 2023-02-21 14:04 ` kernel test robot 2023-02-21 14:35 ` kernel test robot 2023-02-21 14:35 ` kernel test robot 2023-02-21 17:00 ` kernel test robot 2023-02-21 17:00 ` kernel test robot 2023-02-21 17:20 ` kernel test robot 2023-02-21 17:20 ` kernel test robot
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=20230221092206.39741-1-hbh25y@gmail.com \ --to=hbh25y@gmail.com \ --cc=davem@davemloft.net \ --cc=dccp@vger.kernel.org \ --cc=edumazet@google.com \ --cc=gerrit@erg.abdn.ac.uk \ --cc=ian.mcdonald@jandi.co.nz \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.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.