[net,V2,1/2] ptr_ring: try vmalloc() when kmalloc() fails
diff mbox series

Message ID 1518060101-19071-1-git-send-email-jasowang@redhat.com
State New, archived
Headers show
Series
  • [net,V2,1/2] ptr_ring: try vmalloc() when kmalloc() fails
Related show

Commit Message

Jason Wang Feb. 8, 2018, 3:21 a.m. UTC
This patch switch to use kvmalloc_array() for using a vmalloc()
fallback to help in case kmalloc() fails.

Reported-by: syzbot+e4d4f9ddd4295539735d@syzkaller.appspotmail.com
Fixes: 2e0ab8ca83c12 ("ptr_ring: array based FIFO for pointers")
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/linux/ptr_ring.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jason Wang Feb. 8, 2018, 3:26 a.m. UTC | #1
On 2018年02月08日 11:21, Jason Wang wrote:
> This patch switch to use kvmalloc_array() for using a vmalloc()
> fallback to help in case kmalloc() fails.
>
> Reported-by: syzbot+e4d4f9ddd4295539735d@syzkaller.appspotmail.com
> Fixes: 2e0ab8ca83c12 ("ptr_ring: array based FIFO for pointers")
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
>   include/linux/ptr_ring.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
> index 1883d61..9c3b748 100644
> --- a/include/linux/ptr_ring.h
> +++ b/include/linux/ptr_ring.h
> @@ -466,7 +466,7 @@ static inline int ptr_ring_consume_batched_bh(struct ptr_ring *r,
>   
>   static inline void **__ptr_ring_init_queue_alloc(unsigned int size, gfp_t gfp)
>   {
> -	return kcalloc(size, sizeof(void *), gfp);
> +	return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO);
>   }
>   
>   static inline void __ptr_ring_set_size(struct ptr_ring *r, int size)

Forget the kvfree() ...

Will post V3.

Sorry.

Patch
diff mbox series

diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
index 1883d61..9c3b748 100644
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
@@ -466,7 +466,7 @@  static inline int ptr_ring_consume_batched_bh(struct ptr_ring *r,
 
 static inline void **__ptr_ring_init_queue_alloc(unsigned int size, gfp_t gfp)
 {
-	return kcalloc(size, sizeof(void *), gfp);
+	return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO);
 }
 
 static inline void __ptr_ring_set_size(struct ptr_ring *r, int size)