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=-4.6 required=3.0 tests=DATE_IN_PAST_12_24, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS, USER_AGENT_MUTT 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 816B3C04AB1 for ; Sat, 11 May 2019 17:41:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50DA62183F for ; Sat, 11 May 2019 17:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726210AbfEKRlf (ORCPT ); Sat, 11 May 2019 13:41:35 -0400 Received: from outgoing-auth-1.mit.edu ([18.9.28.11]:51298 "EHLO outgoing.mit.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725879AbfEKRlf (ORCPT ); Sat, 11 May 2019 13:41:35 -0400 Received: from callcc.thunk.org (rrcs-67-53-55-100.west.biz.rr.com [67.53.55.100]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id x4BHfQIM002914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 11 May 2019 13:41:28 -0400 Received: by callcc.thunk.org (Postfix, from userid 15806) id B987A420028; Fri, 10 May 2019 21:37:01 -0400 (EDT) Date: Fri, 10 May 2019 21:37:01 -0400 From: "Theodore Ts'o" To: Chengguang Xu Cc: jack@suse.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] jbd2: fix potential double free Message-ID: <20190511013701.GD2534@mit.edu> Mail-Followup-To: Theodore Ts'o , Chengguang Xu , jack@suse.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org References: <1557484608-23514-1-git-send-email-cgxu519@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1557484608-23514-1-git-send-email-cgxu519@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 10, 2019 at 06:36:48PM +0800, Chengguang Xu wrote: > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c > index 37e16d969925..0f1ac43d0560 100644 > --- a/fs/jbd2/journal.c > +++ b/fs/jbd2/journal.c > @@ -2299,7 +2299,7 @@ static void jbd2_journal_destroy_slabs(void) > } > } > > -static int jbd2_journal_create_slab(size_t size) > +static int __init jbd2_journal_create_slab(size_t size) > { > static DEFINE_MUTEX(jbd2_slab_create_mutex); > int i = order_base_2(size) - 10; I had to remove this hunk. It's incorrect, since jbd2_journal_load calls this function when mounting file systems. So it can't be marked __init. - Ted