答复: [External Mail]Re: [PATCH] Prevent entering an infinite loop when i is 0

[刘金宝]

>Hi,
>
>On 2024/8/22 14:27, liujinbao1 wrote:
>> From: liujinbao1 <liujinbao1 at xiaomi.com>
>>
>> When i=0 and err is not equal to 0,
>> the while(-1) loop will enter into an
>> infinite loop. This patch avoids this issue.
>
>Missing your Signed-off-by here.
>
>> ---
>>   fs/erofs/decompressor.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c index
>> c2253b6a5416..1b2b8cc7911c 100644
>> --- a/fs/erofs/decompressor.c
>> +++ b/fs/erofs/decompressor.c
>> @@ -539,6 +539,8 @@ int __init z_erofs_init_decompressor(void)
>>       for (i = 0; i < Z_EROFS_COMPRESSION_MAX; ++i) {
>>               err = z_erofs_decomp[i] ? z_erofs_decomp[i]->init() : 0;
>>               if (err) {
>> +                     if (!i)
>> +                             return err;
>>                       while (--i)
>>                               if (z_erofs_decomp[i])
>>                                       z_erofs_decomp[i]->exit();
>
>
>Thanks for catching this, how about the following diff (space-demaged).
>
>If it looks good to you, could you please send another version?

Sure, I can do that.

>diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c index c2253b6a5416..c9b2bc1309d2 100644
>--- a/fs/erofs/decompressor.c
>+++ b/fs/erofs/decompressor.c
>@@ -534,18 +534,16 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)
>
>  int __init z_erofs_init_decompressor(void)
>  {
>-       int i, err;
>+       int i, err = 0;
>
>         for (i = 0; i < Z_EROFS_COMPRESSION_MAX; ++i) {
>                 err = z_erofs_decomp[i] ? z_erofs_decomp[i]->init() : 0;
>-               if (err) {
>+               if (err && i)
>                         while (--i)
>                                 if (z_erofs_decomp[i])
>                                         z_erofs_decomp[i]->exit();
>-                       return err;
>-               }
>         }
>-       return 0;
>+       return err;
>  }
>
#/******本邮件及其附件含有小米公司的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from XIAOMI, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!******/#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linux-erofs/attachments/20240822/88180157/attachment.htm>