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 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 F0020C433DF for ; Fri, 19 Jun 2020 16:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD87821852 for ; Fri, 19 Jun 2020 16:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592584186; bh=NWMLcpyikfEyP3vhtWUk2KoId6XXFoE9zxGdE35jo0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Eh45gRxY1ojhdWTtlfb6zA2LeI140QE1ZfJ00dslWH5vzZOSow/xE1Ha6IFEmgEI7 aTi//LJcSegYhkPvJpbOkRZpFXs9+VdqhmvSz+fTkGDIZ6rTBbNyQYPXQmJatgllz2 GpUTLMAH43hnniYCdCpHpXzLWbbc7ZKUtrlCF5GQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394934AbgFSQ3n (ORCPT ); Fri, 19 Jun 2020 12:29:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:49046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389843AbgFSOyX (ORCPT ); Fri, 19 Jun 2020 10:54:23 -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 3E53F21556; Fri, 19 Jun 2020 14:54:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578463; bh=NWMLcpyikfEyP3vhtWUk2KoId6XXFoE9zxGdE35jo0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vicvIHstJcx5OzSc3ZYezBT9W/iF2OlaFeLyr7ZGpMPZwxyQ8MW7Zu4HxFjGvhei1 0J1F2me451N6Sb+AGKXzUTWHMZ2NEp4KdJ4ujRS78L6UkSkCHyVQmlPHDhpVevVgr4 i8XO7LTEIUFkFF3VJH0pxRhhqk6ymiG7pD2QTY4Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?=E4=BA=BF=E4=B8=80?= , Ard Biesheuvel Subject: [PATCH 4.19 032/267] efi/efivars: Add missing kobject_put() in sysfs entry creation error path Date: Fri, 19 Jun 2020 16:30:17 +0200 Message-Id: <20200619141650.400313581@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel commit d8bd8c6e2cfab8b78b537715255be8d7557791c0 upstream. The documentation provided by kobject_init_and_add() clearly spells out the need to call kobject_put() on the kobject if an error is returned. Add this missing call to the error path. Cc: Reported-by: 亿一 Signed-off-by: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/efivars.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/firmware/efi/efivars.c +++ b/drivers/firmware/efi/efivars.c @@ -586,8 +586,10 @@ efivar_create_sysfs_entry(struct efivar_ ret = kobject_init_and_add(&new_var->kobj, &efivar_ktype, NULL, "%s", short_name); kfree(short_name); - if (ret) + if (ret) { + kobject_put(&new_var->kobj); return ret; + } kobject_uevent(&new_var->kobj, KOBJ_ADD); if (efivar_entry_add(new_var, &efivar_sysfs_list)) {