DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: <dev@dpdk.org>, <fengchengwen@huawei.com>
Subject: Re: [PATCH v2] test/argparse: change initialization to workaround LTO
Date: Mon, 30 Jun 2025 16:20:21 +0100	[thread overview]
Message-ID: <aGKrNT8h5FGVrBjH@bricha3-mobl1.ger.corp.intel.com> (raw)
In-Reply-To: <20250630145934.56969-1-stephen@networkplumber.org>

On Mon, Jun 30, 2025 at 07:58:49AM -0700, Stephen Hemminger wrote:
> When compiled with Link Time Optimization, the existing code
> generated an error, because the compiler was unable to intuit
> that there was space in the flexible array.
> 
> In function ‘test_argparse_copy’,
>     inlined from ‘test_argparse_init_obj’ at ../app/test/test_argparse.c:108:2,
>     inlined from ‘test_argparse_opt_callback_parse_int_of_no_val’ at ../app/test/test_argparse.c:490:8:
> ../app/test/test_argparse.c:96:17: warning: ‘memcpy’ writing 56 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=]
>    96 |                 memcpy(&dst->args[i], &src->args[i], sizeof(src->args[i]));
> 
> Initialiizing a structure with flexible array is special case
> and compiler expands the structure to fit. But inside the copy
> function it no longer knew that.
> 
> The workaround is to put the copy inside the same function
> and use structure assignment. Also macro should be uppper case.
> 
> Fixes: 6c5c6571601c ("argparse: verify argument config")
> Cc: fengchengwen@huawei.com
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> v2 - simpler fix is to just inline the copy
> 
>  app/test/test_argparse.c | 31 +++++++++++++++----------------
>  1 file changed, 15 insertions(+), 16 deletions(-)
> 

LGTM. One suggestion inline, in case you feel like adjusting things
further.

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

> diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
> index 0a229752fa..d5b777e321 100644
> --- a/app/test/test_argparse.c
> +++ b/app/test/test_argparse.c
> @@ -71,7 +71,7 @@ test_argparse_callback(uint32_t index, const char *value, void *opaque)
>  }
>  
>  /* valid templater, must contain at least two args. */
> -#define argparse_templater() { \
> +#define ARGPARSE_TEMPLATE { \
>  	.prog_name = "test_argparse", \
>  	.usage = "-a xx -b yy", \
>  	.descriptor = NULL, \
> @@ -87,25 +87,24 @@ test_argparse_callback(uint32_t index, const char *value, void *opaque)
>  	}, \
>  }
>  
> -static void
> -test_argparse_copy(struct rte_argparse *dst, struct rte_argparse *src)
> -{
> -	uint32_t i;
> -	memcpy(dst, src, sizeof(*src));
> -	for (i = 0; /* NULL */; i++) {
> -		memcpy(&dst->args[i], &src->args[i], sizeof(src->args[i]));
> -		if (src->args[i].name_long == NULL)
> -			break;
> -	}
> -}
>  
>  static struct rte_argparse *
>  test_argparse_init_obj(void)
>  {
> -	static struct rte_argparse backup = argparse_templater();
> -	static struct rte_argparse obj = argparse_templater();
> -	/* Because obj may be overwritten, do a deep copy. */
> -	test_argparse_copy(&obj, &backup);
> +	/* Note: initialization of structure with flexible arrary
> +	 * increases the size of the variable to match.
> +	 */
> +	static const struct rte_argparse backup = ARGPARSE_TEMPLATE;
> +	static struct rte_argparse obj = ARGPARSE_TEMPLATE;
> +	unsigned int i;
> +
> +	obj = backup;
> +	for (i = 0; ; i++) {
> +		obj.args[i] = backup.args[i];
> +		if (backup.args[i].name_long == NULL)
> +			break;
> +	}

We should consider either making this a "do { } while" loop or adding the
termination condition to the "for" loop statement as normal. For example:

	unsigned int i = 0;

	obj = backup;
	do {
		obj.args[i] = backup.args[i];
	} while (backup.args[++i].name_long != NULL);

or else:

	obj = backup;
	for (i = 0; backup.args[i].name_long != NULL; i++)
		obj.args[i] = backup.args[i];
	obj.args[i] = ARGPARSE_ARG_END();

I'd tend toward the second, myself, but what is in your patch above is fine
as-is too.

> +
>  	return &obj;
>  }
>  
> -- 
> 2.47.2
> 

  reply	other threads:[~2025-06-30 15:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-27 16:22 [PATCH] test/argparse: fix out of bound memcpy Stephen Hemminger
2025-06-27 18:56 ` Bruce Richardson
2025-06-30 14:57   ` Stephen Hemminger
2025-06-30 14:58 ` [PATCH v2] test/argparse: change initialization to workaround LTO Stephen Hemminger
2025-06-30 15:20   ` Bruce Richardson [this message]
2025-06-30 15:23     ` Stephen Hemminger
2025-06-30 15:24     ` Stephen Hemminger
2025-07-01 15:41 ` [PATCH v3] " Stephen Hemminger
2025-07-01 15:48   ` Bruce Richardson

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=aGKrNT8h5FGVrBjH@bricha3-mobl1.ger.corp.intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=fengchengwen@huawei.com \
    --cc=stephen@networkplumber.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).