Received: by 10.223.185.116 with SMTP id b49csp1085716wrg; Fri, 23 Feb 2018 11:40:13 -0800 (PST) X-Google-Smtp-Source: AH8x225WvZD2Nup4qbL4wYP2XVI0ECnB8I1oWShl33Jis6v4+wvC4rpVbKtkMR/e9dkcBm+glOWg X-Received: by 10.99.154.18 with SMTP id o18mr2290558pge.344.1519414813624; Fri, 23 Feb 2018 11:40:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519414813; cv=none; d=google.com; s=arc-20160816; b=r1DYhi5GmV2+Z9aa2IRBJtwapMwXCyFBIcLJXCZ87BMfmZjd/iswXNYc62F+6eoGn6 W8bRxm5xkGqt+5WI++kd5nJKifVNejdyYCD1soLs03QvXCrD3r7+cp6kw3c6D73VZ08X dnYqjEUbUrcV9pr60QiOy6L8pBIOAOUp5ZclUk/2oWt8Y4O9P8MYLSy5LfTrwRqaqDfC L0hvhFzycyCfjx9cap61PV/Ly+I7Z8K4G6wT8+xkvrWjoR8BJuwcZ0/XQk0abDUHwgxl iF4VicUJI4hlSWccL01QPys9qL5lZ3jJXO9wGnGwGhVGIA55aoZUDGy+FVUW9fvCwoCw faMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=kyj5shQQ+f2M7VIlaJ/SpZ2jZ4JVpgaBPd958F8e5cE=; b=ZW/X0aZAIE3hQyED2aefpE5nFx02HPJO5sosmC0W3IAyhE7DkyMBdY2MP7fxWZo+Oh OkqY2h1VnF6OIVGTHlKJsrKxodSPv4rWZAsZTOWU+PvEAweZ8ALwKFai9vAmJbEDm1mH X/MIibTdRYD9ouTpAcxHCfEj+C9gP1w3YgiUuejr0zK8kDGKSiK+R6e1xUZ7tOwvz7aY NrRYBYLQy8pjBwSyP4Fe6NAgC20OrQnb/qKRqSKp4kQL2QnCdPH/SwULdE2o4wRghTfk QAk0u+jGjBW2UtQ5Ap9uFcI3j/mRbreb5Q3Qx/SvNbusJOsKRAtpbijYP7WUGfTvSe+N j/kw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si2262379plt.242.2018.02.23.11.39.59; Fri, 23 Feb 2018 11:40:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754780AbeBWTiE (ORCPT + 99 others); Fri, 23 Feb 2018 14:38:04 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:45530 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934664AbeBWSuL (ORCPT ); Fri, 23 Feb 2018 13:50:11 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B47B911B5; Fri, 23 Feb 2018 18:50:10 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+e4d4f9ddd4295539735d@syzkaller.appspotmail.com, Jason Wang , "Michael S. Tsirkin" , "David S. Miller" Subject: [PATCH 4.14 025/159] ptr_ring: try vmalloc() when kmalloc() fails Date: Fri, 23 Feb 2018 19:25:33 +0100 Message-Id: <20180223170746.211788598@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Wang commit 0bf7800f1799b5b1fd7d4f024e9ece53ac489011 upstream. 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 Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/linux/ptr_ring.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/include/linux/ptr_ring.h +++ b/include/linux/ptr_ring.h @@ -445,11 +445,14 @@ static inline int ptr_ring_consume_batch __PTR_RING_PEEK_CALL_v; \ }) +/* Not all gfp_t flags (besides GFP_KERNEL) are allowed. See + * documentation for vmalloc for which of them are legal. + */ static inline void **__ptr_ring_init_queue_alloc(unsigned int size, gfp_t gfp) { if (size * sizeof(void *) > KMALLOC_MAX_SIZE) return NULL; - 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) @@ -582,7 +585,7 @@ static inline int ptr_ring_resize(struct spin_unlock(&(r)->producer_lock); spin_unlock_irqrestore(&(r)->consumer_lock, flags); - kfree(old); + kvfree(old); return 0; } @@ -622,7 +625,7 @@ static inline int ptr_ring_resize_multip } for (i = 0; i < nrings; ++i) - kfree(queues[i]); + kvfree(queues[i]); kfree(queues); @@ -630,7 +633,7 @@ static inline int ptr_ring_resize_multip nomem: while (--i >= 0) - kfree(queues[i]); + kvfree(queues[i]); kfree(queues); @@ -645,7 +648,7 @@ static inline void ptr_ring_cleanup(stru if (destroy) while ((ptr = ptr_ring_consume(r))) destroy(ptr); - kfree(r->queue); + kvfree(r->queue); } #endif /* _LINUX_PTR_RING_H */