From nobody Sun Feb 8 19:26:00 2026 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FC91184524 for ; Mon, 1 Dec 2025 21:29:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764624566; cv=none; b=uh/cMr9S/0UYdM28Ra0PEj6jOvyED5TDI1jXKCVsdwjYzgk0QJMuvk3u+bTnV3/mNqHBVuoqx2OwhQt4yqTb7KhpW3pYX5LlM0Bf9NRllyu0Ee6mTzbsCIM6mmG1e8BNkY9XK0SWXijhaC94SDxVDHf+HinG18S2p/qiEXfeJCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764624566; c=relaxed/simple; bh=OHacAfIyeO5JPAiH83V5PfherCAW10QkpHeTsDtRm/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XDemN45aySDQlM0t3bbcHhG1zARlCG92CGgQINN8O4jCdW6FBwjS8aYMX2JYlQy96oWPXFsl5/08Mz/WphTStPWtGCYhl124yxcPeRqVomydnOcIsg+sL1vE+tsWApP91Owjy1isOzRdf/2JoAlYEP/4VcNyIwDkciE9zpCtsJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kawgDZZJ; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kawgDZZJ" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-6416a95d397so742642a12.2 for ; Mon, 01 Dec 2025 13:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764624563; x=1765229363; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JhLRJqiJP7YUf8BkFXMNu5F1Fow6nH74qHWkckyQhp8=; b=kawgDZZJREIASC/topJGJCTzeDfqHk9/1wDGShIl9iS3V+rP8SZKr3i+FVUO4ZBXE3 pCAaKB3KjYJp13rLVzxrLtVxMTKQG0l+4UwzT5JKuT3akYhLvWhIQ8QSSdr5hV7R3y1G Deaw/n1TNZiLgAcSYA61W9PwHopTPXcmn6VuP1iOd+K/pjJEulluG0plijDxczqa7K2B BQI3t6BxciXjBt0+zyLcU+oHyp2PsaayvK7pRRblvQOJeH3U54i4qeRAzsTkV+WFNM1x 8w5fGsMRefnCCEYHkyPch9pw8ppyhw3rsEituz1qoy9fTjdsixB8e34wN3rWUCtzuGJc oMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764624563; x=1765229363; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JhLRJqiJP7YUf8BkFXMNu5F1Fow6nH74qHWkckyQhp8=; b=Pjgq/LrmdBmWhTlea4/oOIkJI4ECh8gJlzMRMZl50UEMoh3DpEBFFGaixN8zlTxguR ZWRpdCEm09c/5G3kQKvz2OUWQQjbD55kZskmM5sLMGqR2OjqSpJ4wU5vmHBQ/PXf6/EX NMZZUlgiiUl1mkMDehECFHoXfqhzPgGdrtn4qcL6AmSxg90ZdVxwu5MrKUQlXJb4MmFL hHGA7lMo4gtTOxaFOrDHnakWGcya7GjA5I0cW1ZvhX4tPelRoPYkO+kMMP/naERLrgz3 +v2MwVnjz3BCFtXckBJ9U3R0v9pRfm2D4s1NuZ33ujzX4eefFePdq+oRSl7tpLjkTagt 7szw== X-Forwarded-Encrypted: i=1; AJvYcCU4rse6FbmeXVNbeLXzqCRmfwIrzHVE3/IpTgSpozPqNo6xU6NFRMWdzhwJjkqh4p4mzpKQe+/r+z4lA2E=@vger.kernel.org X-Gm-Message-State: AOJu0YzEofNKQGhCh019uL770DDUySwRK0ngByL7ouIqk1iIhgfMI3do 8PUCFT9s5bMC/5tn7YW/LwV/rpZJ4Op2ICEkWuDkAfifXGD4x40rR3qL X-Gm-Gg: ASbGncuXNpsE7Op+PZtm4mYGmuPVexmhrkGB+WLW35Zf/wIUfheemDUlDb2oRFqmnxq EUk5b7wFGWbmmEYjMFIu8nP+p4dJTReWqiOGNZoERWF/A8ioFtOtK/BvmpgIvWNLXBWaaROrVGl 60PdfTjGYOPvcDa2+x36QrbOuyjZKJBQ7UObOXbM047Sr89w6+GgcG18WSo22t7K4N5fFzDKPwl HhVOAuZIAbDt05ZQjOFuT8lscf22niZouIQn5ej4QB0rcF+EgTPJ9rUriQCWvxRQSXKTR47mSRf dicQ4eYzGHl5uCQ2HlAZXcDJO0VHUxZByhkU3/sUbZaSa8GIJtliQcnRd1Ag04paeLdvMSJbo7x 2CDEyb6lmAMtaUu5Rki4Lz9NffDV/FBXUVCxXOAoivsOoOpiFXsJSE4CNRNnqVSC9ruRclYFpNF H9FkWfFcDA/rq9cw== X-Google-Smtp-Source: AGHT+IHTR6TMIRL8Gy6fWSoJPxXo+FyHwv0N4OoyTuMM3fnw1YXGzI2yUlsj0aEIj3kgGeRaqGBUTQ== X-Received: by 2002:a05:6402:2106:b0:645:3dce:b53b with SMTP id 4fb4d7f45d1cf-6455a063751mr19485790a12.5.1764624562788; Mon, 01 Dec 2025 13:29:22 -0800 (PST) Received: from bhk ([165.50.39.229]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6475104fd7asm13519497a12.23.2025.12.01.13.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 13:29:22 -0800 (PST) From: Mehdi Ben Hadj Khelifa To: slava@dubeyko.com, glaubitz@physik.fu-berlin.de, frank.li@vivo.com, jack@suse.cz, sandeen@redhat.com, brauner@kernel.org, Slava.Dubeyko@ibm.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, david.hunter.linux@gmail.com, khalid@kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Mehdi Ben Hadj Khelifa , stable@vger.kernel.org, syzbot+ad45f827c88778ff7df6@syzkaller.appspotmail.com Subject: [PATCH v3 1/2] hfs: ensure sb->s_fs_info is always cleaned up Date: Mon, 1 Dec 2025 23:23:06 +0100 Message-ID: <20251201222843.82310-2-mehdi.benhadjkhelifa@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251201222843.82310-1-mehdi.benhadjkhelifa@gmail.com> References: <20251201222843.82310-1-mehdi.benhadjkhelifa@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When hfs was converted to the new mount api a bug was introduced by changing the allocation pattern of sb->s_fs_info. If setup_bdev_super() fails after a new superblock has been allocated by sget_fc(), but before hfs_fill_super() takes ownership of the filesystem-specific s_fs_info data it was leaked. Fix this by freeing sb->s_fs_info in hfs_kill_super(). Cc: stable@vger.kernel.org Fixes: ffcd06b6d13b ("hfs: convert hfs to use the new mount api") Reported-by: syzbot+ad45f827c88778ff7df6@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=3Dad45f827c88778ff7df6 Tested-by: Viacheslav Dubeyko Signed-off-by: Christian Brauner Signed-off-by: Mehdi Ben Hadj Khelifa Reviewed-by: Viacheslav Dubeyko --- fs/hfs/mdb.c | 35 ++++++++++++++--------------------- fs/hfs/super.c | 10 +++++++++- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c index 53f3fae60217..f28cd24dee84 100644 --- a/fs/hfs/mdb.c +++ b/fs/hfs/mdb.c @@ -92,7 +92,7 @@ int hfs_mdb_get(struct super_block *sb) /* See if this is an HFS filesystem */ bh =3D sb_bread512(sb, part_start + HFS_MDB_BLK, mdb); if (!bh) - goto out; + return -EIO; =20 if (mdb->drSigWord =3D=3D cpu_to_be16(HFS_SUPER_MAGIC)) break; @@ -102,13 +102,14 @@ int hfs_mdb_get(struct super_block *sb) * (should do this only for cdrom/loop though) */ if (hfs_part_find(sb, &part_start, &part_size)) - goto out; + return -EIO; } =20 HFS_SB(sb)->alloc_blksz =3D size =3D be32_to_cpu(mdb->drAlBlkSiz); if (!size || (size & (HFS_SECTOR_SIZE - 1))) { pr_err("bad allocation block size %d\n", size); - goto out_bh; + brelse(bh); + return -EIO; } =20 size =3D min(HFS_SB(sb)->alloc_blksz, (u32)PAGE_SIZE); @@ -125,14 +126,16 @@ int hfs_mdb_get(struct super_block *sb) brelse(bh); if (!sb_set_blocksize(sb, size)) { pr_err("unable to set blocksize to %u\n", size); - goto out; + return -EIO; } =20 bh =3D sb_bread512(sb, part_start + HFS_MDB_BLK, mdb); if (!bh) - goto out; - if (mdb->drSigWord !=3D cpu_to_be16(HFS_SUPER_MAGIC)) - goto out_bh; + return -EIO; + if (mdb->drSigWord !=3D cpu_to_be16(HFS_SUPER_MAGIC)) { + brelse(bh); + return -EIO; + } =20 HFS_SB(sb)->mdb_bh =3D bh; HFS_SB(sb)->mdb =3D mdb; @@ -174,7 +177,7 @@ int hfs_mdb_get(struct super_block *sb) =20 HFS_SB(sb)->bitmap =3D kzalloc(8192, GFP_KERNEL); if (!HFS_SB(sb)->bitmap) - goto out; + return -EIO; =20 /* read in the bitmap */ block =3D be16_to_cpu(mdb->drVBMSt) + part_start; @@ -185,7 +188,7 @@ int hfs_mdb_get(struct super_block *sb) bh =3D sb_bread(sb, off >> sb->s_blocksize_bits); if (!bh) { pr_err("unable to read volume bitmap\n"); - goto out; + return -EIO; } off2 =3D off & (sb->s_blocksize - 1); len =3D min((int)sb->s_blocksize - off2, size); @@ -199,12 +202,12 @@ int hfs_mdb_get(struct super_block *sb) HFS_SB(sb)->ext_tree =3D hfs_btree_open(sb, HFS_EXT_CNID, hfs_ext_keycmp); if (!HFS_SB(sb)->ext_tree) { pr_err("unable to open extent tree\n"); - goto out; + return -EIO; } HFS_SB(sb)->cat_tree =3D hfs_btree_open(sb, HFS_CAT_CNID, hfs_cat_keycmp); if (!HFS_SB(sb)->cat_tree) { pr_err("unable to open catalog tree\n"); - goto out; + return -EIO; } =20 attrib =3D mdb->drAtrb; @@ -229,12 +232,6 @@ int hfs_mdb_get(struct super_block *sb) } =20 return 0; - -out_bh: - brelse(bh); -out: - hfs_mdb_put(sb); - return -EIO; } =20 /* @@ -359,8 +356,6 @@ void hfs_mdb_close(struct super_block *sb) * Release the resources associated with the in-core MDB. */ void hfs_mdb_put(struct super_block *sb) { - if (!HFS_SB(sb)) - return; /* free the B-trees */ hfs_btree_close(HFS_SB(sb)->ext_tree); hfs_btree_close(HFS_SB(sb)->cat_tree); @@ -373,6 +368,4 @@ void hfs_mdb_put(struct super_block *sb) unload_nls(HFS_SB(sb)->nls_disk); =20 kfree(HFS_SB(sb)->bitmap); - kfree(HFS_SB(sb)); - sb->s_fs_info =3D NULL; } diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 47f50fa555a4..df289cbdd4e8 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c @@ -431,10 +431,18 @@ static int hfs_init_fs_context(struct fs_context *fc) return 0; } =20 +static void hfs_kill_super(struct super_block *sb) +{ + struct hfs_sb_info *hsb =3D HFS_SB(sb); + + kill_block_super(sb); + kfree(hsb); +} + static struct file_system_type hfs_fs_type =3D { .owner =3D THIS_MODULE, .name =3D "hfs", - .kill_sb =3D kill_block_super, + .kill_sb =3D hfs_kill_super, .fs_flags =3D FS_REQUIRES_DEV, .init_fs_context =3D hfs_init_fs_context, }; --=20 2.52.0 From nobody Sun Feb 8 19:26:00 2026 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4966F248F77 for ; Mon, 1 Dec 2025 21:29:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764624570; cv=none; b=JEM1uErXL2efk4tuUvzcOazB/qypUdTOlvWav5E5wulxkZm0JotqyYD7npIjZt35MVqlckq44A8USSpIzffxmLn+/lZqBx60ZRZzUWfPdbTizfrrSIHMuh3H1WHyEnewborlLbii9jgykq1BREp+C8vXuSzdcdgqDGZYHE405es= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764624570; c=relaxed/simple; bh=lSvg/K7yPsKUCFTcfSOcZg9VsOKeNcGmYT1edmcLv+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZUKr1vV0OZfXEgfg8wZzDYlNYpq/1u/hLeMsl3MnI6A5+lI0bSnPBV5H9LnFwE4BfQUk3NYckJye8138mw9L0R9eS2K5Dy9OdeyZ0NV58HRShtDK8TGMERjH9F5jE3EahKgY/BgaZ7Bh1DNSct+qkLqcxElPujBGGobmoXZafTs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eOM/prtQ; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eOM/prtQ" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-6416133c627so755957a12.0 for ; Mon, 01 Dec 2025 13:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764624567; x=1765229367; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S0Yn63rsGsd4Hj7X1d2hk85Oe6NspbG2sX3h25PNq3o=; b=eOM/prtQzCQkC3h2dB0feks+lWNJnMfgWJmuVHWXl6qTGv7Vmsizgz10yBKuH7+4Ek U08BtSGDiDI3VFnNy68nUFLLkZvg6m27DIlitsimj8YV5a2R2Fcq3cJC9H5OlMiw1XBA 4gDEdsg5udlNMRl2n8bWiRrUs9hXvCygKAxIijfPm6ZhP/U2SZUIhbP9QJGl/Reg5twr IKl3/yMI1ga1/EtaOWRV0D4jTi7ttgqvSnOq74eFwzXGS9bHNKkkYBKps8Vp0EPabH5m AxIlYKN7WqFBjeEQo/katzZ+qjOdI4Kz+6jzGqB7QDFdLQN+w36Z2H6nAJiIMtoW57iE 3ehg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764624567; x=1765229367; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=S0Yn63rsGsd4Hj7X1d2hk85Oe6NspbG2sX3h25PNq3o=; b=GXTERfRJnL3cvKt5wkkNWvAd+7isXinDO4WwZtuyL6ZstS6tnDOOsoBt1RoWDgWhsm gNlO+R2ff4ohLeWpcvwzjDPyuih5F5GE+Wxmk4US5bIUWbrfXlDsNrZuisYGgQEAZGFs KujeX4WuWHU6OqtF3z8MVCVqULTMUbKfwVyN3CZFGItf+ucALLwf2pDkKZfV8xX37f2n AUQPm8MnJqx7IV9t32rtEyl+OmRkfzkloy6erCd5OQFOKwgwN8Svcx7FE93+6DQsCbsn vzn8DWxTVxzIxOZqZ8INe45d1Y1N3yAaFyGW7C/A4nBJKbnERcMUam0cmFJG3TDsN8ls 4r7g== X-Forwarded-Encrypted: i=1; AJvYcCXYeTSGePDe7WC+2ssMnVD0rtrpFMGPmXri9U00s5LwwH9bdx7RYWRRSPDr6FoOLdlfUdgJo9H3itk4hKk=@vger.kernel.org X-Gm-Message-State: AOJu0YxT2agZB+G+gUmKt2rtu7lsnqLwmC2Ke2npUjZg5bGOsjH/IxJI PRXrl8GZNUlIxY4IcvYkFmbSZI7SLp3C7IaSgn7MMtohErMe0MTinPqw X-Gm-Gg: ASbGncua5lWU7tMRiVFzI2KMQyDOBU3gWooiF+TF1Hw8Rs35B/mKPO0omRgPHArhXM5 /qWX4SFQAp8AR0+LK3IDSk+bFt/KVdAccNiqhb8jV4KltJX8Dp0xeVxgRgh+Zm9OSFeiCCjl+EG gUpyzC8NT7ZZNzdOi8+gfY5/IZxxFXbQ9M379hJR8+Qr3uszZqg8axdrxM2wP+vNntPmIgB9052 BfzSf+Z2S+9m2OG0FD7B7ltn/p04x880BAfFB2ljG+M1FG0gDtgETEtOjA2bOrCNxQaftu0PJkd uc+nUPd8wo5heDcE4ey9MBiPbj4xrcg2wAj3Z66FdFReCqHwNU6cDZudl7xQI396nydReoCVkq/ D0rieMtPwomWKi/2VSTtWj+2LR6AeebIG7U2ryOUSsdHiju52zFMtBBSD9ZxFpfx4Q3afVLX+/b B4/5XUNLILDAVUlA== X-Google-Smtp-Source: AGHT+IGu1SlFFpvIYvIrQ+apMAxrKVb7zxXr0S8Sxm9iSmu6U7ZmdNyqWZGcEobHLqob2qXQsUOdtQ== X-Received: by 2002:a05:6402:5190:b0:645:e986:682f with SMTP id 4fb4d7f45d1cf-645e98668camr14681838a12.8.1764624566404; Mon, 01 Dec 2025 13:29:26 -0800 (PST) Received: from bhk ([165.50.39.229]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6475104fd7asm13519497a12.23.2025.12.01.13.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 13:29:26 -0800 (PST) From: Mehdi Ben Hadj Khelifa To: slava@dubeyko.com, glaubitz@physik.fu-berlin.de, frank.li@vivo.com, jack@suse.cz, sandeen@redhat.com, brauner@kernel.org, Slava.Dubeyko@ibm.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, david.hunter.linux@gmail.com, khalid@kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Mehdi Ben Hadj Khelifa , stable@vger.kernel.org Subject: [PATCH v3 2/2] hfsplus: ensure sb->s_fs_info is always cleaned up Date: Mon, 1 Dec 2025 23:23:07 +0100 Message-ID: <20251201222843.82310-3-mehdi.benhadjkhelifa@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251201222843.82310-1-mehdi.benhadjkhelifa@gmail.com> References: <20251201222843.82310-1-mehdi.benhadjkhelifa@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When hfsplus was converted to the new mount api a bug was introduced by changing the allocation pattern of sb->s_fs_info. If setup_bdev_super() fails after a new superblock has been allocated by sget_fc(), but before hfsplus_fill_super() takes ownership of the filesystem-specific s_fs_info data it was leaked. Fix this by freeing sb->s_fs_info in hfsplus_kill_super(). Cc: stable@vger.kernel.org Fixes: 432f7c78cb00 ("hfsplus: convert hfsplus to use the new mount api") Reported-by: Viacheslav Dubeyko =20 Tested-by: Viacheslav Dubeyko Signed-off-by: Christian Brauner Signed-off-by: Mehdi Ben Hadj Khelifa Reviewed-by: Viacheslav Dubeyko --- fs/hfsplus/super.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 16bc4abc67e0..8734520f6419 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -328,8 +328,6 @@ static void hfsplus_put_super(struct super_block *sb) hfs_btree_close(sbi->ext_tree); kfree(sbi->s_vhdr_buf); kfree(sbi->s_backup_vhdr_buf); - call_rcu(&sbi->rcu, delayed_free); - hfs_dbg("finished\n"); } =20 @@ -629,7 +627,6 @@ static int hfsplus_fill_super(struct super_block *sb, s= truct fs_context *fc) out_unload_nls: unload_nls(sbi->nls); unload_nls(nls); - kfree(sbi); return err; } =20 @@ -688,10 +685,18 @@ static int hfsplus_init_fs_context(struct fs_context = *fc) return 0; } =20 +static void hfsplus_kill_super(struct super_block *sb) +{ + struct hfsplus_sb_info *sbi =3D HFSPLUS_SB(sb); + + kill_block_super(sb); + call_rcu(&sbi->rcu, delayed_free); +} + static struct file_system_type hfsplus_fs_type =3D { .owner =3D THIS_MODULE, .name =3D "hfsplus", - .kill_sb =3D kill_block_super, + .kill_sb =3D hfsplus_kill_super, .fs_flags =3D FS_REQUIRES_DEV, .init_fs_context =3D hfsplus_init_fs_context, }; --=20 2.52.0