Merge tag 'usercopy-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[linux.git] / drivers / nvmem / meson-mx-efuse.c

diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index b9f9ce089de94ae0ac8ab0e9ef795f2589baed6f..07c9f38c1c6078be2aa3e91fcbe269724eaa4165 100644 (file)
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -155,7 +155,8 @@ static int meson_mx_efuse_read(void *context, unsigned int offset,
                if (err)
                        break;
 
-               memcpy(buf + i, &tmp, efuse->config.word_size);
+               memcpy(buf + i, &tmp,
+                      min_t(size_t, bytes - i, efuse->config.word_size));
        }
 
        meson_mx_efuse_mask_bits(efuse, MESON_MX_EFUSE_CNTL1,