Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <5678317c-9fd2-4557-6e28-984a8b74b99c@oracle.com>
Date:   Thu, 23 Sep 2021 09:54:44 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.1.1
Subject: Re: [PATCH v2] JFS: fix memleak in jfs_mount
Content-Language: en-US
To:     Dongliang Mu <mudongliangabcd@gmail.com>
Cc:     jfs-discussion@lists.sourceforge.net,
        linux-kernel <linux-kernel@vger.kernel.org>
References: <20210904023800.1813036-1-mudongliangabcd@gmail.com>
 <CAD-N9QV5OMe0ryEKaUYkwmNyOtu+Sgi7h2B0JFSK5Jj9bbQPQQ@mail.gmail.com>
From:   Dave Kleikamp <dave.kleikamp@oracle.com>
In-Reply-To: <CAD-N9QV5OMe0ryEKaUYkwmNyOtu+Sgi7h2B0JFSK5Jj9bbQPQQ@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGtSOXRiZ2xRNjE4Sk10c0FnMGpLUXU0eXdZR21CSXhETEYvQXBOWWtpRE4y?=
 =?utf-8?B?Z2dDN09tV2xpYjk2VklBWmFQVGNjdnRZVWZBeWp5Q21PS2wyTXRkOXV3OENV?=
 =?utf-8?B?T0lOVjJYTDRWWWduUW0zQkFYVWxYUitvcDdVS01zQlZib2JNVnRkQ0VuMlhu?=
 =?utf-8?B?WGtUVFBiZXQzMTBoTlNaQ1RXcU9SdUNyTzdUWUl4WUZWSTBIUE91Q1g3MEFW?=
 =?utf-8?B?cUdGZWlKaWpqS0I2alYyWnFGeU9sUS9VenZYZ2Z6dFRYNG02L3AwNzN1dHAw?=
 =?utf-8?B?V2p6TlVoMUV3UjY1bUtlaVVUWm01ODB5UTUzcElLcjNvbHZpM3J6ajNaSUF1?=
 =?utf-8?B?YjVOaUJZemowN2ZNMTV5N3ZNRVdXaGppQjFmeGgxNkdHRGFGWC95Z0tNM0lE?=
 =?utf-8?B?VmdINHZwTFFTQkthVklILzl0ZlpYMFRYYVd4L3JnSWtKZ3lQUVdaV1loUTB3?=
 =?utf-8?B?UFYzZHRlNEZPeXNYdWlqK1pVYmlRNDVtUFo4cDMrY2kxQUhZeXlpK2lrT3I4?=
 =?utf-8?B?VkRjUGF6YVRuWWQ0YXZ2bGtWckJuMWcyQ2FtRi9BcmwwS3Rsb2VlQ0tWaDFm?=
 =?utf-8?B?UGlTdTBEM0xJMlRzZVI3NmJVQnFCcmh1N216Z3hCZWNCTVJNTXkzMkxVd1ZN?=
 =?utf-8?B?a2xkbDRjSUUycWlMWnh6MHdUNVRGNmduUWlVOXZ3WU12NUpkUkppY3E3S2ND?=
 =?utf-8?B?Wk1xV0lwamMxMkZHbkw4SW9GMkZxNExGZ1NHeFZSdDNzV3dya3FaTE5mSGZj?=
 =?utf-8?B?Q1lPczM1a1B1Y1F1OFNhMzcyUXB3VDZhdU13dmxvMjhSbGpCaXA1a1RVbzBQ?=
 =?utf-8?B?NXMrUHdFTWJ1M2dpU1Jud21vc3hTcENNbFFTU3JFZWlBOUYwTCtPUXpFYzUr?=
 =?utf-8?B?aXFEWDZ3UkgvNGpleEZZU01sOXZJNTdYb3NMTG1rTlFvaTFxVTNqOC9jdFJl?=
 =?utf-8?B?aXMyZWx4Rk02VC8yU0V2L2pPb090SzFsdEZHdnpmbTkwbGdFbTJod3RsZGtz?=
 =?utf-8?B?RDJKUDNST1hHekFXMy9hZUVmdHZTRDgrdWdESnAvQjhCRk5SeEQ4aTZHUU9o?=
 =?utf-8?B?VDNXSHBpV2wyTUtUQ092U3gzQUM2WXhkOElrLzIrbFVNaEhYVDJObjZhY0xp?=
 =?utf-8?B?RDRtWG1nUnpvaE9zTzR0RVBLUTV2cDJpd3JEbTExZDFGOU54NERXaDJ1NG5s?=
 =?utf-8?B?TUFaMHp0SnFvR05oTVZvQy9FNUNndGFueUlvZkdZeStPR0ZsMGwweEo5dnBw?=
 =?utf-8?B?Nk1Pbk9CSUs0T2RJNXc2bEM2d0IzamJOc2Zob0Y2b2RkWnpTelpMSE5Vem5N?=
 =?utf-8?B?em1oR0JvdndJVSswd0pwUEdLakxITHcvVUJsem5FMFZKdjJWaUFNajAxUnUx?=
 =?utf-8?B?T0dWaTFEbjdPdlpVTW1UbkRocTV3NDNkV0w4RjIvQktaUmJjcUFFTHVvOVRi?=
 =?utf-8?B?eVo1L3hxa1BXV1RCbUd4VmpkRHMrMUQ2Tm9zL2cxWTFZSEUxMXpPcmVGZmNF?=
 =?utf-8?B?djlFT2JvbU16QzAzbFdDWFZ4bEFWTjMxbm1lS3lGS0JNeWlEZ3NndTB4M0R0?=
 =?utf-8?B?REUxd2tvSWFvMXpoU2ZsQUFkVGZGMHM4TVdxYXRZdGg0L3VrNG03aWRSZDFr?=
 =?utf-8?B?ZFJyaHAreWpaZFhZUi9wVlhKRWV6bGx6bmE2VjFJK2dQWlQ1T3NFN3M0MnQ1?=
 =?utf-8?B?OUl4bCtyYmx5UnBMV2JBZFpNSEFnVkpqT2RyUWRVc2I1ZDMwTFNlRFBFQnUw?=
 =?utf-8?Q?A6UOfjP3Y/WielwkRfr1ARVaEd0p4nbrtKLiAfI?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 961a0ca9-6dd1-460b-34d5-08d97ea20c05
X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4665.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 14:54:30.3086
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: e3bUDm1dCM1Nl10qEsDtDxGoQV2gZ7rxHNBl9UsmEAtvKfAKkNd/cJ8jTDgwIcy8yGch/n7nwDljAzUBQDEWeeEQJwqypbVmiyAq5zutORs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4556
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10116 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 bulkscore=0
 malwarescore=0 mlxscore=0 mlxlogscore=999 spamscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109200000
 definitions=main-2109230094
X-Proofpoint-GUID: 8A4FS_UBHZhMAhbaCp_BUaBR9P-UXjn2
X-Proofpoint-ORIG-GUID: 8A4FS_UBHZhMAhbaCp_BUaBR9P-UXjn2
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 9/22/21 19:53, Dongliang Mu wrote:
> Any update on this thread?

Sorry for taking this long to get back to it. The patch looks good. It 
should show up in linux-next shortly.

Shaggy

> 
> On Sat, Sep 4, 2021 at 10:38 AM Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>>
>> In jfs_mount, when diMount(ipaimap2) fails, it goes to errout35. However,
>> the following code does not free ipaimap2 allocated by diReadSpecial.
>>
>> Fix this by refactoring the error handling code of jfs_mount. To be
>> specific, modify the lable name and free ipaimap2 when the above error
>> ocurrs.
>>
>> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
>> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
>> ---
>> v1->v2: change "return rc" to "goto out"; fix one coding style
>>   fs/jfs/jfs_mount.c | 51 ++++++++++++++++++++--------------------------
>>   1 file changed, 22 insertions(+), 29 deletions(-)
>>
>> diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
>> index 5d7d7170c03c..aa4ff7bcaff2 100644
>> --- a/fs/jfs/jfs_mount.c
>> +++ b/fs/jfs/jfs_mount.c
>> @@ -81,14 +81,14 @@ int jfs_mount(struct super_block *sb)
>>           * (initialize mount inode from the superblock)
>>           */
>>          if ((rc = chkSuper(sb))) {
>> -               goto errout20;
>> +               goto out;
>>          }
>>
>>          ipaimap = diReadSpecial(sb, AGGREGATE_I, 0);
>>          if (ipaimap == NULL) {
>>                  jfs_err("jfs_mount: Failed to read AGGREGATE_I");
>>                  rc = -EIO;
>> -               goto errout20;
>> +               goto out;
>>          }
>>          sbi->ipaimap = ipaimap;
>>
>> @@ -99,7 +99,7 @@ int jfs_mount(struct super_block *sb)
>>           */
>>          if ((rc = diMount(ipaimap))) {
>>                  jfs_err("jfs_mount: diMount(ipaimap) failed w/rc = %d", rc);
>> -               goto errout21;
>> +               goto err_ipaimap;
>>          }
>>
>>          /*
>> @@ -108,7 +108,7 @@ int jfs_mount(struct super_block *sb)
>>          ipbmap = diReadSpecial(sb, BMAP_I, 0);
>>          if (ipbmap == NULL) {
>>                  rc = -EIO;
>> -               goto errout22;
>> +               goto err_umount_ipaimap;
>>          }
>>
>>          jfs_info("jfs_mount: ipbmap:0x%p", ipbmap);
>> @@ -120,7 +120,7 @@ int jfs_mount(struct super_block *sb)
>>           */
>>          if ((rc = dbMount(ipbmap))) {
>>                  jfs_err("jfs_mount: dbMount failed w/rc = %d", rc);
>> -               goto errout22;
>> +               goto err_ipbmap;
>>          }
>>
>>          /*
>> @@ -139,7 +139,7 @@ int jfs_mount(struct super_block *sb)
>>                  if (!ipaimap2) {
>>                          jfs_err("jfs_mount: Failed to read AGGREGATE_I");
>>                          rc = -EIO;
>> -                       goto errout35;
>> +                       goto err_umount_ipbmap;
>>                  }
>>                  sbi->ipaimap2 = ipaimap2;
>>
>> @@ -151,7 +151,7 @@ int jfs_mount(struct super_block *sb)
>>                  if ((rc = diMount(ipaimap2))) {
>>                          jfs_err("jfs_mount: diMount(ipaimap2) failed, rc = %d",
>>                                  rc);
>> -                       goto errout35;
>> +                       goto err_ipaimap2;
>>                  }
>>          } else
>>                  /* Secondary aggregate inode table is not valid */
>> @@ -168,7 +168,7 @@ int jfs_mount(struct super_block *sb)
>>                  jfs_err("jfs_mount: Failed to read FILESYSTEM_I");
>>                  /* open fileset secondary inode allocation map */
>>                  rc = -EIO;
>> -               goto errout40;
>> +               goto err_umount_ipaimap2;
>>          }
>>          jfs_info("jfs_mount: ipimap:0x%p", ipimap);
>>
>> @@ -178,41 +178,34 @@ int jfs_mount(struct super_block *sb)
>>          /* initialize fileset inode allocation map */
>>          if ((rc = diMount(ipimap))) {
>>                  jfs_err("jfs_mount: diMount failed w/rc = %d", rc);
>> -               goto errout41;
>> +               goto err_ipimap;
>>          }
>>
>> -       goto out;
>> +       return rc;
>>
>>          /*
>>           *      unwind on error
>>           */
>> -      errout41:                /* close fileset inode allocation map inode */
>> +err_ipimap:
>> +       /* close fileset inode allocation map inode */
>>          diFreeSpecial(ipimap);
>> -
>> -      errout40:                /* fileset closed */
>> -
>> +err_umount_ipaimap2:
>>          /* close secondary aggregate inode allocation map */
>> -       if (ipaimap2) {
>> +       if (ipaimap2)
>>                  diUnmount(ipaimap2, 1);
>> +err_ipaimap2:
>> +       /* close aggregate inodes */
>> +       if (ipaimap2)
>>                  diFreeSpecial(ipaimap2);
>> -       }
>> -
>> -      errout35:
>> -
>> -       /* close aggregate block allocation map */
>> +err_umount_ipbmap:     /* close aggregate block allocation map */
>>          dbUnmount(ipbmap, 1);
>> +err_ipbmap:            /* close aggregate inodes */
>>          diFreeSpecial(ipbmap);
>> -
>> -      errout22:                /* close aggregate inode allocation map */
>> -
>> +err_umount_ipaimap:    /* close aggregate inode allocation map */
>>          diUnmount(ipaimap, 1);
>> -
>> -      errout21:                /* close aggregate inodes */
>> +err_ipaimap:           /* close aggregate inodes */
>>          diFreeSpecial(ipaimap);
>> -      errout20:                /* aggregate closed */
>> -
>> -      out:
>> -
>> +out:
>>          if (rc)
>>                  jfs_err("Mount JFS Failure: %d", rc);
>>
>> --
>> 2.25.1
>>