]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cxl/pmem: Use size_add() against integer overflow
authorYu Zhe <yuzhe@nfschina.com>
Tue, 27 Sep 2022 07:02:47 +0000 (15:02 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Nov 2022 08:27:21 +0000 (09:27 +0100)
[ Upstream commit 4f1aa35f1fb7d51b125487c835982af792697ecb ]

"struct_size() + n" may cause a integer overflow,
use size_add() to handle it.

Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
Link: https://lore.kernel.org/r/20220927070247.23148-1-yuzhe@nfschina.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cxl/pmem.c

index faade12279f02c96e0ef92cf218d9327aa15a1fb..e0646097a3d4b0327c8d3d828f770fc7f3687431 100644 (file)
@@ -151,7 +151,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;
 
        set_lsa =