From patchwork Tue Jun 16 15:33:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D18CEC433E0 for ; Tue, 16 Jun 2020 15:39:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B91D32145D for ; Tue, 16 Jun 2020 15:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592321960; bh=5/lH2KRzHCeETvLwWO2Es2Pqsk6+CLgbLIvVr3d8lLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uNSURyic4xUAMosis4F8hJtmMO+uoANHCvIdSNrwxcsgXykRQCyMJQf6Z/lWKHdI0 UvX/PACGr+Ym8biUXbY07/kTSeo1ox3OcmvO9HhfPQ8tIX1VJ3xxPRT7Ml+SW6kmV/ id2rK4vuF+kUFZY5iUnt0SLXInWkWIamamKdLiB8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730277AbgFPPjU (ORCPT ); Tue, 16 Jun 2020 11:39:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:52558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730894AbgFPPjQ (ORCPT ); Tue, 16 Jun 2020 11:39:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 060E62166E; Tue, 16 Jun 2020 15:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592321956; bh=5/lH2KRzHCeETvLwWO2Es2Pqsk6+CLgbLIvVr3d8lLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c4X+X//hF/x9XYq0NJfwVe+ClvcEm5FWs5HLBeQY1Oa4CNIip/yXzkGmqwahofGB9 aItn9EbQlSTALd0IZJfLbKICSfL7FBA/HyOBBUlYs7v8nydgCE/Z8zJtUiJGWlSHek HbLY7818DNcZ1BFL0pss6F+VDObufx+mwHbgJ5io= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Denis Efremov , Jens Axboe Subject: [PATCH 5.4 050/134] io_uring: use kvfree() in io_sqe_buffer_register() Date: Tue, 16 Jun 2020 17:33:54 +0200 Message-Id: <20200616153103.181618765@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153100.633279950@linuxfoundation.org> References: <20200616153100.633279950@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Denis Efremov commit a8c73c1a614f6da6c0b04c393f87447e28cb6de4 upstream. Use kvfree() to free the pages and vmas, since they are allocated by kvmalloc_array() in a loop. Fixes: d4ef647510b1 ("io_uring: avoid page allocation warnings") Signed-off-by: Denis Efremov Signed-off-by: Jens Axboe Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200605093203.40087-1-efremov@linux.com Signed-off-by: Greg Kroah-Hartman --- fs/io_uring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3498,8 +3498,8 @@ static int io_sqe_buffer_register(struct ret = 0; if (!pages || nr_pages > got_pages) { - kfree(vmas); - kfree(pages); + kvfree(vmas); + kvfree(pages); pages = kvmalloc_array(nr_pages, sizeof(struct page *), GFP_KERNEL); vmas = kvmalloc_array(nr_pages,