Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp867773rwi; Thu, 13 Oct 2022 06:20:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4njPONdU165kaxlF0uOBpW+0dg7ks+JwqFSjh8gx13yWaH9ZHuqaW3RuQLaD9j5UaFGcNs X-Received: by 2002:a17:907:2c74:b0:78d:845a:1cf9 with SMTP id ib20-20020a1709072c7400b0078d845a1cf9mr23543775ejc.359.1665667247774; Thu, 13 Oct 2022 06:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665667247; cv=none; d=google.com; s=arc-20160816; b=f0V7VDD0zKsFPErafYaAOziyK2S2ByqSZZyZM4RLLjizVBif8h63MElWQ9D9M0i296 N0U/eSZ+jJ9ad8jPtVc9aIvYDjPjkmiRc6UPG5vot8Tnm/5ofy1QCy7ryzH5J/J0uLQv eUai17XB+S/leTgIa94pr8NAGT0J2qUTxTmcue1aYEv/Lp10CpnTnxWUSCcYGoQJSJjW sjT3J2+JTmjAjDrp+xVp1RD7zn1g6gVBNc7STsk02KcF4NYrumg12GHHA/iz6NOTVsx8 ur/sfnTvUeRkvEyHnl4TlyonnqnhtL49NAWYoR4JrmvAXZ1+7BXwRjZdZKos3eLn13GJ eNcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=fOHB/G8cGU9YezJzpmNjkQ3Xckb0uSZC5y2uKn1T4Ek=; b=jDAoNJUz38uyQKVHN6ZxKiTL3xZCMKZoOYOMudHShnqpeA+cEFYStc0tAWYPjt0ESs UVleku3I3sCFEm+xDqPbndivtBYgiYWt4VmQhCVQX17uSVdI3RJ/uAyX5j6R0V5UzSl8 JLC1049SvRb1Ci6Jmgf+WEFIeD2yNiDdhI9MDXRZ37i5+hRXj8osV8XPBV5s+t0qyFSE tzs6BXoEmL4LB9RcFrYSXtIqsgEmMtVGeWClJ22NOy6+TbxieRvnBIpC699kaZxxjgOJ +7hA48zzLLmLy9YHLR/y77dd0F389NJLGB4DbV71TZ62Z+aB3B3ieByao7mtmRX7zZoX JQkw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l5-20020a170906a40500b0078a891e407dsi15025022ejz.974.2022.10.13.06.20.17; Thu, 13 Oct 2022 06:20:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229867AbiJMNMy (ORCPT + 99 others); Thu, 13 Oct 2022 09:12:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229852AbiJMNMv (ORCPT ); Thu, 13 Oct 2022 09:12:51 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A786914D8D8 for ; Thu, 13 Oct 2022 06:12:47 -0700 (PDT) Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mp8vr6jCmzmVBT; Thu, 13 Oct 2022 21:08:08 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 13 Oct 2022 21:12:45 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 13 Oct 2022 21:12:44 +0800 From: Yang Yingliang To: CC: , , Subject: [PATCH] platform/loongarch: laptop: fix possible UAF in generic_acpi_laptop_init() Date: Thu, 13 Oct 2022 21:12:09 +0800 Message-ID: <20221013131209.775969-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current the return value of 'sub_driver->init' is not checked, if sparse_keymap_setup() called in the init function fails, 'generic_inputdev' is freed, then it willl lead a UAF when using it in generic_acpi_laptop_init(). Fix it by checking return value. Set generic_inputdev to NULL after free to avoid double free it. Fixes: 6246ed09111f ("LoongArch: Add ACPI-based generic laptop driver") Signed-off-by: Yang Yingliang --- drivers/platform/loongarch/loongson-laptop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/platform/loongarch/loongson-laptop.c b/drivers/platform/loongarch/loongson-laptop.c index f0166ad5d2c2..a665fd1042ac 100644 --- a/drivers/platform/loongarch/loongson-laptop.c +++ b/drivers/platform/loongarch/loongson-laptop.c @@ -448,6 +448,7 @@ static int __init event_init(struct generic_sub_driver *sub_driver) if (ret < 0) { pr_err("Failed to setup input device keymap\n"); input_free_device(generic_inputdev); + generic_inputdev = NULL; return ret; } @@ -502,8 +503,11 @@ static int __init generic_subdriver_init(struct generic_sub_driver *sub_driver) if (ret) return -EINVAL; - if (sub_driver->init) - sub_driver->init(sub_driver); + if (sub_driver->init) { + ret = sub_driver->init(sub_driver); + if (ret) + goto err_out; + } if (sub_driver->notify) { ret = setup_acpi_notify(sub_driver); -- 2.25.1