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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 7BA15C07E95 for ; Wed, 7 Jul 2021 09:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6517061CBE for ; Wed, 7 Jul 2021 09:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231414AbhGGJvV (ORCPT ); Wed, 7 Jul 2021 05:51:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231315AbhGGJvT (ORCPT ); Wed, 7 Jul 2021 05:51:19 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11E51C061574; Wed, 7 Jul 2021 02:48:39 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id b12so1615311pfv.6; Wed, 07 Jul 2021 02:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tg8Rx1wWlkNbqejilODw641z/b4x4fF9Uuzm0P4x4D0=; b=PrljIE+wuY2ULWNMaoB/MgNZV+baMZEw5jLy1StHdilD/VcS99UswWyI5DXhaoGnEc AK4A0yeTJpj7bkQC1MWz2HCkCqXW1ZHPIioYLmu5prnU1wrqtg1CmDK6aMjhYzlbVL67 3nB+owYsvkETSfWHkXSrJ7bqkCO33K5pLz9eXGDh29BvuaxxTeFylm8m5T5rtWVI4nkz garM9kmXjh8FTwyk0Tki6hAMb7fxkX0Lw3Au7we3s03pmxuFOiDkBBW9JXCS+pOvJ0BS Ebu3SgcWHAGkBwNkJJOWZyc3jOVTJgaV3Y1UBdKg8y/KvqWA54wIP4HqHEtMrqcrLw9v kivQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tg8Rx1wWlkNbqejilODw641z/b4x4fF9Uuzm0P4x4D0=; b=r6xGre6ap+T7NQ3a6eWv9vXHiynFrC4x2/eIl5MERb5DJIwJW7lNQgIBI9Ll8DaKGO Z2xobVGNNl/65Ouk0/qsDrjtwclmCYdh1cRd+fk5AUvGZNCEhXef6SGHZtjeB6BUd5tV fIE4zDGqhZmnHf9LdDbw3h866ybKrhOf8J+zww9lzCrNoxwNgPfu/qX4M+aG7oPouEvh fEoItdcdQ0A8x8noYyZK9igPw4ss90c75KnXqQfOYKE1ljj3vznaU6wu6BSO8vUw+6DL Uc2W15+E6yOhYGZMBVuYJQGZR5NaORSteN0tU2B38BaRZ3mL64FRxwCb2OSFu1O5T9Ix kj5w== X-Gm-Message-State: AOAM532qJQufzXPrpitT2qnzgJSLqT9ZriLGCXwnzEn0VLbh6f3kQWTw Mc+A4QqbxRmtdr0udFDpG5E= X-Google-Smtp-Source: ABdhPJwzoD7XpLG+ejjR/4L4w+W/UAs4g1cNnqO6ljcsHijn2XYr6O/t1MU6B78EiAdv1CW7ZH0+bA== X-Received: by 2002:a63:5b02:: with SMTP id p2mr25412371pgb.161.1625651318569; Wed, 07 Jul 2021 02:48:38 -0700 (PDT) Received: from carrot.localdomain (i60-35-90-140.s42.a014.ap.plala.or.jp. [60.35.90.140]) by smtp.gmail.com with ESMTPSA id gd19sm80137pjb.38.2021.07.07.02.48.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jul 2021 02:48:37 -0700 (PDT) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs , LKML Subject: [PATCH 3/6] nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group Date: Wed, 7 Jul 2021 18:48:23 +0900 Message-Id: <1625651306-10829-4-git-send-email-konishi.ryusuke@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1625651306-10829-1-git-send-email-konishi.ryusuke@gmail.com> References: <1625651306-10829-1-git-send-email-konishi.ryusuke@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nanyong Sun If kobject_init_and_add return with error, kobject_put() is needed here to avoid memory leak, because kobject_init_and_add may return error without freeing the memory associated with the kobject it allocated. Link: https://lkml.kernel.org/r/20210629022556.3985106-4-sunnanyong@huawei.com Signed-off-by: Nanyong Sun Signed-off-by: Ryusuke Konishi --- fs/nilfs2/sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 43f660beb9b4..5dc468ff5903 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -92,8 +92,8 @@ err = kobject_init_and_add(kobj, &nilfs_##name##_ktype, parent, \ #name); \ if (err) \ - return err; \ - return 0; \ + kobject_put(kobj); \ + return err; \ } \ static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \ { \ -- 1.8.3.1