[PATCH 1/1] MIPS: APRP: Fix an issue when device_create() fails.

[PATCH 1/1] MIPS: APRP: Fix an issue when device_create() fails.

[Sebastien Bourdelin]

If a call to device_create() fails for a channel during the initialize
loop, we need to clean the devices entries already created before
leaving.

Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
---
 arch/mips/kernel/rtlx-cmp.c | 3 +++
 arch/mips/kernel/rtlx-mt.c  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/arch/mips/kernel/rtlx-cmp.c b/arch/mips/kernel/rtlx-cmp.c
index 758fb3c..d26dcc4 100644
--- a/arch/mips/kernel/rtlx-cmp.c
+++ b/arch/mips/kernel/rtlx-cmp.c
@@ -77,6 +77,9 @@ int __init rtlx_module_init(void)
 		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
 				    "%s%d", RTLX_MODULE_NAME, i);
 		if (IS_ERR(dev)) {
+			while (i--)
+				device_destroy(mt_class, MKDEV(major, i));
+
 			err = PTR_ERR(dev);
 			goto out_chrdev;
 		}
diff --git a/arch/mips/kernel/rtlx-mt.c b/arch/mips/kernel/rtlx-mt.c
index 5a66b97..cb95470 100644
--- a/arch/mips/kernel/rtlx-mt.c
+++ b/arch/mips/kernel/rtlx-mt.c
@@ -103,6 +103,9 @@ int __init rtlx_module_init(void)
 		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
 				    "%s%d", RTLX_MODULE_NAME, i);
 		if (IS_ERR(dev)) {
+			while (i--)
+				device_destroy(mt_class, MKDEV(major, i));
+
 			err = PTR_ERR(dev);
 			goto out_chrdev;
 		}
-- 
1.8.3.4

Re: [PATCH 1/1] MIPS: APRP: Fix an issue when device_create() fails.

[Deng-Cheng Zhu]

On 06/19/2014 01:30 PM, Sebastien Bourdelin wrote:
> If a call to device_create() fails for a channel during the initialize
> loop, we need to clean the devices entries already created before
> leaving.
>
> Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
> ---
>   arch/mips/kernel/rtlx-cmp.c | 3 +++
>   arch/mips/kernel/rtlx-mt.c  | 3 +++
>   2 files changed, 6 insertions(+)
>
> diff --git a/arch/mips/kernel/rtlx-cmp.c b/arch/mips/kernel/rtlx-cmp.c
> index 758fb3c..d26dcc4 100644
> --- a/arch/mips/kernel/rtlx-cmp.c
> +++ b/arch/mips/kernel/rtlx-cmp.c
> @@ -77,6 +77,9 @@ int __init rtlx_module_init(void)
>   		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
>   				    "%s%d", RTLX_MODULE_NAME, i);
>   		if (IS_ERR(dev)) {
> +			while (i--)

--i?

> +				device_destroy(mt_class, MKDEV(major, i));
> +
>   			err = PTR_ERR(dev);
>   			goto out_chrdev;
>   		}
> diff --git a/arch/mips/kernel/rtlx-mt.c b/arch/mips/kernel/rtlx-mt.c
> index 5a66b97..cb95470 100644
> --- a/arch/mips/kernel/rtlx-mt.c
> +++ b/arch/mips/kernel/rtlx-mt.c
> @@ -103,6 +103,9 @@ int __init rtlx_module_init(void)
>   		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
>   				    "%s%d", RTLX_MODULE_NAME, i);
>   		if (IS_ERR(dev)) {
> +			while (i--)

Same here.

> +				device_destroy(mt_class, MKDEV(major, i));
> +
>   			err = PTR_ERR(dev);
>   			goto out_chrdev;
>   		}



Deng-Cheng

Re: [PATCH 1/1] MIPS: APRP: Fix an issue when device_create() fails.

[Sebastien Bourdelin]

Hi,

correct me if i'm wrong, but if we pre-decrement, it will decrement
before evaluate and the channel 0 will never be destroy.
So the while condition must change too accordingly.
In any case inside the while loop, "i" will be "i - 1" so we destroy the
previously device.
I think it's correct like this.

On 06/20/2014 01:32 PM, Deng-Cheng Zhu wrote:
> On 06/19/2014 01:30 PM, Sebastien Bourdelin wrote:
>> If a call to device_create() fails for a channel during the initialize
>> loop, we need to clean the devices entries already created before
>> leaving.
>>
>> Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
>> ---
>>   arch/mips/kernel/rtlx-cmp.c | 3 +++
>>   arch/mips/kernel/rtlx-mt.c  | 3 +++
>>   2 files changed, 6 insertions(+)
>>
>> diff --git a/arch/mips/kernel/rtlx-cmp.c b/arch/mips/kernel/rtlx-cmp.c
>> index 758fb3c..d26dcc4 100644
>> --- a/arch/mips/kernel/rtlx-cmp.c
>> +++ b/arch/mips/kernel/rtlx-cmp.c
>> @@ -77,6 +77,9 @@ int __init rtlx_module_init(void)
>>   		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
>>   				    "%s%d", RTLX_MODULE_NAME, i);
>>   		if (IS_ERR(dev)) {
>> +			while (i--)
> --i?
>
>> +				device_destroy(mt_class, MKDEV(major, i));
>> +
>>   			err = PTR_ERR(dev);
>>   			goto out_chrdev;
>>   		}
>> diff --git a/arch/mips/kernel/rtlx-mt.c b/arch/mips/kernel/rtlx-mt.c
>> index 5a66b97..cb95470 100644
>> --- a/arch/mips/kernel/rtlx-mt.c
>> +++ b/arch/mips/kernel/rtlx-mt.c
>> @@ -103,6 +103,9 @@ int __init rtlx_module_init(void)
>>   		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
>>   				    "%s%d", RTLX_MODULE_NAME, i);
>>   		if (IS_ERR(dev)) {
>> +			while (i--)
> Same here.
>
>> +				device_destroy(mt_class, MKDEV(major, i));
>> +
>>   			err = PTR_ERR(dev);
>>   			goto out_chrdev;
>>   		}
>
>
> Deng-Cheng
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/