aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/st.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r--drivers/scsi/st.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index c9e27e752c25..50c66ccc4b41 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3888,7 +3888,7 @@ static struct st_buffer *new_tape_buffer(int need_dma, int max_sg)
3888 tb->dma = need_dma; 3888 tb->dma = need_dma;
3889 tb->buffer_size = 0; 3889 tb->buffer_size = 0;
3890 3890
3891 tb->reserved_pages = kzalloc(max_sg * sizeof(struct page *), 3891 tb->reserved_pages = kcalloc(max_sg, sizeof(struct page *),
3892 GFP_KERNEL); 3892 GFP_KERNEL);
3893 if (!tb->reserved_pages) { 3893 if (!tb->reserved_pages) {
3894 kfree(tb); 3894 kfree(tb);
@@ -4915,7 +4915,8 @@ static int sgl_map_user_pages(struct st_buffer *STbp,
4915 if (count == 0) 4915 if (count == 0)
4916 return 0; 4916 return 0;
4917 4917
4918 if ((pages = kmalloc(max_pages * sizeof(*pages), GFP_KERNEL)) == NULL) 4918 pages = kmalloc_array(max_pages, sizeof(*pages), GFP_KERNEL);
4919 if (pages == NULL)
4919 return -ENOMEM; 4920 return -ENOMEM;
4920 4921
4921 /* Try to fault in all of the necessary pages */ 4922 /* Try to fault in all of the necessary pages */