From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0391C3DA7D for ; Wed, 28 Dec 2022 15:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233449AbiL1Pep (ORCPT ); Wed, 28 Dec 2022 10:34:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233854AbiL1Pen (ORCPT ); Wed, 28 Dec 2022 10:34:43 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3AB515FFC for ; Wed, 28 Dec 2022 07:34:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7EFCC6155C for ; Wed, 28 Dec 2022 15:34:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89BCCC433D2; Wed, 28 Dec 2022 15:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1672241681; bh=iCIgmZeyVgW2U7zvjqK90AJ3FwEtEIKU7+2c3T9hRxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1gGJZHGMAU5VAzX0hXt088GigJWeJSjOTUGYhQSIOp1v4fT6Qie32QVPFt+Aoexun WQQmxhlKrHjiklncU2dIB76tfczuFzxLKfZwxaqCOXKOR0N4YylwUEf+Eg3TrNYgaL 19xPlThYEnR79pNtEZ4N7Cizer8jURgepUw7aLVg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miaoqian Lin , Luis Chamberlain , Sasha Levin Subject: [PATCH 6.0 0315/1073] module: Fix NULL vs IS_ERR checking for module_get_next_page Date: Wed, 28 Dec 2022 15:31:43 +0100 Message-Id: <20221228144336.563375392@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221228144328.162723588@linuxfoundation.org> References: <20221228144328.162723588@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Miaoqian Lin [ Upstream commit 45af1d7aae7d5520d2858f8517a1342646f015db ] The module_get_next_page() function return error pointers on error instead of NULL. Use IS_ERR() to check the return value to fix this. Fixes: b1ae6dc41eaa ("module: add in-kernel support for decompressing") Signed-off-by: Miaoqian Lin Reviewed-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- kernel/module/decompress.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/module/decompress.c b/kernel/module/decompress.c index 4d0bcb3d9e44..82c07b1d9797 100644 --- a/kernel/module/decompress.c +++ b/kernel/module/decompress.c @@ -114,8 +114,8 @@ static ssize_t module_gzip_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); - if (!page) { - retval = -ENOMEM; + if (IS_ERR(page)) { + retval = PTR_ERR(page); goto out_inflate_end; } @@ -173,8 +173,8 @@ static ssize_t module_xz_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); - if (!page) { - retval = -ENOMEM; + if (IS_ERR(page)) { + retval = PTR_ERR(page); goto out; } -- 2.35.1