From: David Marchand <david.marchand@redhat.com>
To: Weiguo Li <liwg06@foxmail.com>
Cc: dev <dev@dpdk.org>,
adypodoman@gmail.com, Xiaoyun Li <xiaoyun.li@intel.com>,
"Zhang, Tianfei" <tianfei.zhang@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Ivan Malov <ivan.malov@oktetlabs.ru>,
Jakub Grajciar <jgrajcia@cisco.com>,
Harman Kalra <hkalra@marvell.com>,
Ying A Wang <ying.a.wang@intel.com>,
"Xu, Ting" <ting.xu@intel.com>, simei <simei.su@intel.com>,
Qiming Yang <qiming.yang@intel.com>,
motih@mellanox.com, Shreyansh Jain <shreyansh.jain@nxp.com>,
Satha Rao <skoteshwar@marvell.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Kalesh A P <kalesh-anakkur.purayil@broadcom.com>,
Somnath Kotur <somnath.kotur@broadcom.com>,
Declan Doherty <declan.doherty@intel.com>,
Akhil Goyal <gakhil@marvell.com>,
Nicolas Chautru <nicolas.chautru@intel.com>
Subject: Re: [PATCH 13/20] net/ice: fix memory leaks in error handlings
Date: Thu, 2 Jun 2022 10:04:20 +0200 [thread overview]
Message-ID: <CAJFAV8xwDenmJ4_xQyjFRgqpyNk1qH0mVB12BPBqGhJi9VCp9Q@mail.gmail.com> (raw)
In-Reply-To: <tencent_1F9863BA78C24FBB225C757ABE1F47F84509@qq.com>
On Tue, Feb 22, 2022 at 7:20 PM Weiguo Li <liwg06@foxmail.com> wrote:
> @@ -713,21 +714,28 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad,
> msk_buf[j] = tmp_val * 16 + tmp_c - '0';
> }
>
> - if (ice_parser_create(&ad->hw, &psr))
> - return -rte_errno;
> - if (ice_parser_run(psr, pkt_buf, pkt_len, &rslt))
> - return -rte_errno;
> + if (ice_parser_create(&ad->hw, &psr)) {
> + ret = -rte_errno;
> + goto exit;
> + }
> + if (ice_parser_run(psr, pkt_buf, pkt_len, &rslt)) {
> + ret = -rte_errno;
> + goto exit;
> + }
This part of the patch seems to conflict.
Can you double check and rebase?
Thanks.
--
David Marchand
next prev parent reply other threads:[~2022-06-02 8:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1645551559.git.liwg06@foxmail.com>
2022-02-22 18:17 ` [PATCH 01/20] baseband/acc100: fix a memory leak in acc100 queue setup Weiguo Li
2022-02-23 17:42 ` Chautru, Nicolas
2022-06-24 20:45 ` David Marchand
2022-02-22 18:18 ` [PATCH 02/20] common/dpaax: fix a memory leak in iterate dir Weiguo Li
2022-02-22 18:18 ` [PATCH 03/20] crypto/dpaa2_sec: fix memory leaks in error handlings Weiguo Li
2022-06-24 20:46 ` David Marchand
2022-02-22 18:18 ` [PATCH 04/20] crypto/qat: fix a memory leak when set encrypt key fail Weiguo Li
2022-06-24 20:49 ` David Marchand
2022-02-22 18:18 ` [PATCH 05/20] net/bnxt: fix a memory leak in error handling Weiguo Li
2022-02-22 18:18 ` [PATCH 06/20] net/bnxt: fix 'ctx' memory leak when new malloc fail Weiguo Li
2022-02-22 18:18 ` [PATCH 07/20] net/bnx2x: add clean up for 'rxq' to avoid a memory leak Weiguo Li
2022-02-22 18:18 ` [PATCH 08/20] net/cnxk: free 'node' memory when node add fail Weiguo Li
2022-04-07 9:02 ` Nithin Kumar Dabilpuram
2022-02-22 18:18 ` [PATCH 09/20] net/dpaa: fix a memory leak when validation fail Weiguo Li
2022-02-22 18:18 ` [PATCH 10/20] net/failsafe: fix a memory leak in error handling Weiguo Li
2022-02-22 18:18 ` [PATCH 11/20] net/iavf: " Weiguo Li
2022-02-22 18:18 ` [PATCH 12/20] net/ice: goto clean up lable to avoid memory leak Weiguo Li
2022-02-22 18:18 ` [PATCH 13/20] net/ice: fix memory leaks in error handlings Weiguo Li
2022-06-02 8:04 ` David Marchand [this message]
2022-02-22 18:18 ` [PATCH 14/20] net/ice: avoid fix memory leaks in register parser Weiguo Li
2022-02-22 18:18 ` [PATCH 15/20] net/memif: fix some memory leaks in error handlings Weiguo Li
2022-02-22 18:18 ` [PATCH 16/20] net/sfc: fix a memory leak in error handling Weiguo Li
2022-03-03 7:39 ` Andrew Rybchenko
2022-02-22 18:18 ` [PATCH 17/20] net/vmxnet3: fix memory leaks in error handlings Weiguo Li
2022-02-22 18:18 ` [PATCH 18/20] raw/ifpga/base: " Weiguo Li
2022-02-22 18:28 ` [PATCH 19/20] raw/ntb: fix some " Weiguo Li
2022-02-22 18:28 ` [PATCH 20/20] regex/mlx5: fix a memory leak in error handling Weiguo Li
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=CAJFAV8xwDenmJ4_xQyjFRgqpyNk1qH0mVB12BPBqGhJi9VCp9Q@mail.gmail.com \
--to=david.marchand@redhat.com \
--cc=adypodoman@gmail.com \
--cc=bruce.richardson@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=gakhil@marvell.com \
--cc=hkalra@marvell.com \
--cc=ivan.malov@oktetlabs.ru \
--cc=jgrajcia@cisco.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=liwg06@foxmail.com \
--cc=motih@mellanox.com \
--cc=nicolas.chautru@intel.com \
--cc=qiming.yang@intel.com \
--cc=shreyansh.jain@nxp.com \
--cc=simei.su@intel.com \
--cc=skoteshwar@marvell.com \
--cc=somnath.kotur@broadcom.com \
--cc=stephen@networkplumber.org \
--cc=tianfei.zhang@intel.com \
--cc=ting.xu@intel.com \
--cc=xiaoyun.li@intel.com \
--cc=ying.a.wang@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
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).