From patchwork Thu Jun 10 06:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490203 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iqpG6NeP; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G0vgj2rwjz9sW7; Thu, 10 Jun 2021 16:48:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lrEUA-0002YC-Ep; Thu, 10 Jun 2021 06:48:14 +0000 Received: from mail-pl1-f179.google.com ([209.85.214.179]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrEU8-0002WH-6Q for kernel-team@lists.ubuntu.com; Thu, 10 Jun 2021 06:48:12 +0000 Received: by mail-pl1-f179.google.com with SMTP id x10so462635plg.3 for ; Wed, 09 Jun 2021 23:48:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o5CguEQvcqtTcyIEpKUn5Bjq+aIVqZGFrnhM/vm7j3Q=; b=iqpG6NePVptjUSch43/dGbDR7fG2g6WbOnLHWd1vMajyuxHa7O7azrxe7B/dOGdbwf ZyTyi9Dz5nT89380+67uhgykof7XLRpUBJdiUWJVEFNNcr3i539VYYQmuRXZ/jArSvzZ O6AzdlXlgOGv/4Jw+dl9VAATV9ZFPgmvt8MJKvcszzAfyfhh2P46xZJnpnQxUsAFGWKB 0TLesJapqcABXEOfzYYMl0qHttY77fUC1X3g3Z2Iw2WcJ0GbYAs0DSnJd7f+htXVWJvV jxXZK61vwoYfnw/vgsX1qaKAdlr3N5GL6hjF1EfA3Zvec1Ndk5Z+dc928g8/QSpAUliS Q3Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=o5CguEQvcqtTcyIEpKUn5Bjq+aIVqZGFrnhM/vm7j3Q=; b=SJbhNxDkB6QPnWFypavZg3ZPfXykgd57DvgTAtNcrPHyExHU82vSEmOf27TH55OwjE 8RxheGzrJnv8l7l5E44tkTUliPqDo3DZ7ibNYhZzO8K3l9Z1PsBT/R2BGEskv11sYPGn XgOJ2wRD5HTN1yng/PQ1z5tIXibDFaPANjleo20oIKNWADdntdbLTdMkdpn8Wi5NZ0Zc WjSG1xEEwhveaU3UysrxsZlE0PXUulk0brUPBYB4zYZdqeiL5dUOCEXXZDy/EtRjqZiR 9WVMW7NOtgA2B1Andf1hHkvLbAoUlU/rMtBy972c6tBuoBvfxFoCxESAT/59oNhDMh1N 0YKQ== X-Gm-Message-State: AOAM530qd6j7aKes1njc6OPY+KO5uD5NBXGIMWGEDerKehzQnfdzzS0v 1kWqeAhwu6PqhM2DEYrN2wQvXE7zn/ZF0YyB X-Google-Smtp-Source: ABdhPJzPRdzylrrdv5BaySKBCAAOfaMVlAemStbLi291zj8mosOM/V86dy1f/hxq7wlq0IYC23LbLg== X-Received: by 2002:a17:902:e289:b029:10c:97e9:2c74 with SMTP id o9-20020a170902e289b029010c97e92c74mr3544604plc.34.1623307689597; Wed, 09 Jun 2021 23:48:09 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id b21sm1393329pfp.134.2021.06.09.23.48.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 23:48:08 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/7][SRU][OEM-5.10] platform/x86: dell-wmi-sysman: Fix possible NULL pointer deref on exit Date: Thu, 10 Jun 2021 14:47:51 +0800 Message-Id: <20210610064754.1061717-5-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210610064754.1061717-1-acelan.kao@canonical.com> References: <20210610064754.1061717-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.179; envelope-from=acelan@gmail.com; helo=mail-pl1-f179.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Hans de Goede BugLink: https://bugs.launchpad.net/bugs/1931509 It is possible for release_attributes_data() to get called when the main_dir_kset has not been created yet, move the removal of the bios-reset sysfs attr to under a if (main_dir_kset) check to avoid a NULL pointer deref. Fixes: e8a60aa7404b ("platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems") Cc: Divya Bharathi Cc: Mario Limonciello Reported-by: Alexander Naumann Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20210321115901.35072-3-hdegoede@redhat.com (cherry picked from commit ececdb8983762d08ed726c1e5308d2f77db9ffd1) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c index 8bc44316648ff..99dc2f3bdf49e 100644 --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c @@ -225,12 +225,6 @@ static int create_attributes_level_sysfs_files(void) return ret; } -static void release_reset_bios_data(void) -{ - sysfs_remove_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr); - sysfs_remove_file(&wmi_priv.main_dir_kset->kobj, &pending_reboot.attr); -} - static ssize_t wmi_sysman_attr_show(struct kobject *kobj, struct attribute *attr, char *buf) { @@ -373,8 +367,6 @@ static void destroy_attribute_objs(struct kset *kset) */ static void release_attributes_data(void) { - release_reset_bios_data(); - mutex_lock(&wmi_priv.mutex); exit_enum_attributes(); exit_int_attributes(); @@ -386,12 +378,13 @@ static void release_attributes_data(void) wmi_priv.authentication_dir_kset = NULL; } if (wmi_priv.main_dir_kset) { + sysfs_remove_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr); + sysfs_remove_file(&wmi_priv.main_dir_kset->kobj, &pending_reboot.attr); destroy_attribute_objs(wmi_priv.main_dir_kset); kset_unregister(wmi_priv.main_dir_kset); wmi_priv.main_dir_kset = NULL; } mutex_unlock(&wmi_priv.mutex); - } /**