| Message ID | 20180702214713.2769-1-richard@nod.at |
|---|---|
| State | Accepted |
| Delegated to: | Richard Weinberger |
| Headers | show |
| Series | ubifs: Use kmalloc_array() | expand |
On Mon, Jul 2, 2018 at 2:47 PM, Richard Weinberger <richard@nod.at> wrote: > Since commit 6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()") > we use kmalloc_array() for kmalloc() that computes the length with > a multiplication. > > Cc: Kees Cook <keescook@chromium.org> > Suggested-by: Kees Cook <keescook@chromium.org> > Signed-off-by: Richard Weinberger <richard@nod.at> Reviewed-by: Kees Cook <keescook@chromium.org> Thanks! -Kees > --- > fs/ubifs/journal.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c > index eea12d25a58b..95acc0c04bca 100644 > --- a/fs/ubifs/journal.c > +++ b/fs/ubifs/journal.c > @@ -1285,7 +1285,7 @@ static int truncate_data_node(const struct ubifs_info *c, const struct inode *in > int err, dlen, compr_type, out_len, old_dlen; > > out_len = le32_to_cpu(dn->size); > - buf = kmalloc(out_len * WORST_COMPR_FACTOR, GFP_NOFS); > + buf = kmalloc_array(out_len, WORST_COMPR_FACTOR, GFP_NOFS); > if (!buf) > return -ENOMEM; > > -- > 2.18.0 >
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index eea12d25a58b..95acc0c04bca 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -1285,7 +1285,7 @@ static int truncate_data_node(const struct ubifs_info *c, const struct inode *in int err, dlen, compr_type, out_len, old_dlen; out_len = le32_to_cpu(dn->size); - buf = kmalloc(out_len * WORST_COMPR_FACTOR, GFP_NOFS); + buf = kmalloc_array(out_len, WORST_COMPR_FACTOR, GFP_NOFS); if (!buf) return -ENOMEM;
Since commit 6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()") we use kmalloc_array() for kmalloc() that computes the length with a multiplication. Cc: Kees Cook <keescook@chromium.org> Suggested-by: Kees Cook <keescook@chromium.org> Signed-off-by: Richard Weinberger <richard@nod.at> --- fs/ubifs/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)