RE: [PATCH] cxl/pmem: Use size_add() against integer overflow

From: Dan Williams
Date: Fri Oct 21 2022 - 19:07:13 EST


Yu Zhe wrote:
> "struct_size() + n" may cause a integer overflow,
> use size_add() to handle it.
>
> Signed-off-by: Yu Zhe <yuzhe@xxxxxxxxxxxx>
> ---
> drivers/cxl/pmem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c
> index 7dc0a2fa1a6b..8c08aa009a56 100644
> --- a/drivers/cxl/pmem.c
> +++ b/drivers/cxl/pmem.c
> @@ -148,7 +148,7 @@ static int cxl_pmem_set_config_data(struct cxl_dev_state *cxlds,
> return -EINVAL;
>
> /* 4-byte status follows the input data in the payload */
> - if (struct_size(cmd, in_buf, cmd->in_length) + 4 > buf_len)
> + if (size_add(struct_size(cmd, in_buf, cmd->in_length), 4) > buf_len)
> return -EINVAL;

Looks good, applied for v6.1-rc fixes.