[PATCH] ceph: Check memory allocation result

[PATCH] ceph: Check memory allocation result

[Chengguang Xu]

Should check result of kstrndup() in case of memory allocation failure.

Signed-off-by: Chengguang Xu <cgxu519@icloud.com>
---
 net/ceph/ceph_common.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 5c036d2..1e492ef 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -421,6 +421,10 @@ struct ceph_options *
 			opt->name = kstrndup(argstr[0].from,
 					      argstr[0].to-argstr[0].from,
 					      GFP_KERNEL);
+			if (!opt->name) {
+				err = -ENOMEM;
+				goto out;
+			}
 			break;
 		case Opt_secret:
 		        opt->key = kzalloc(sizeof(*opt->key), GFP_KERNEL);
-- 
1.8.3.1

Re: [PATCH] ceph: Check memory allocation result

[Ilya Dryomov]

On Fri, Jan 26, 2018 at 7:54 AM, Chengguang Xu <cgxu519@icloud.com> wrote:
> Should check result of kstrndup() in case of memory allocation failure.
>
> Signed-off-by: Chengguang Xu <cgxu519@icloud.com>
> ---
>  net/ceph/ceph_common.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
> index 5c036d2..1e492ef 100644
> --- a/net/ceph/ceph_common.c
> +++ b/net/ceph/ceph_common.c
> @@ -421,6 +421,10 @@ struct ceph_options *
>                         opt->name = kstrndup(argstr[0].from,
>                                               argstr[0].to-argstr[0].from,
>                                               GFP_KERNEL);
> +                       if (!opt->name) {
> +                               err = -ENOMEM;
> +                               goto out;
> +                       }
>                         break;
>                 case Opt_secret:
>                         opt->key = kzalloc(sizeof(*opt->key), GFP_KERNEL);

Applied.

Thanks,

                Ilya

Re: [PATCH] ceph: Check memory allocation result

[Chengguang Xu]

Hi Ilya

Is there a specific tree for ceph kernel client?

I found below git repository is quite old.

https://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git/


Thanks,
Chengguang.



> 在 2018年1月30日，上午12:42，Ilya Dryomov <idryomov@gmail.com> 写道：
> 
> On Fri, Jan 26, 2018 at 7:54 AM, Chengguang Xu <cgxu519@icloud.com> wrote:
>> Should check result of kstrndup() in case of memory allocation failure.
>> 
>> Signed-off-by: Chengguang Xu <cgxu519@icloud.com>
>> ---
>> net/ceph/ceph_common.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>> 
>> diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
>> index 5c036d2..1e492ef 100644
>> --- a/net/ceph/ceph_common.c
>> +++ b/net/ceph/ceph_common.c
>> @@ -421,6 +421,10 @@ struct ceph_options *
>>                        opt->name = kstrndup(argstr[0].from,
>>                                              argstr[0].to-argstr[0].from,
>>                                              GFP_KERNEL);
>> +                       if (!opt->name) {
>> +                               err = -ENOMEM;
>> +                               goto out;
>> +                       }
>>                        break;
>>                case Opt_secret:
>>                        opt->key = kzalloc(sizeof(*opt->key), GFP_KERNEL);
> 
> Applied.
> 
> Thanks,
> 
>                Ilya

Re: [PATCH] ceph: Check memory allocation result

[Ilya Dryomov]

On Tue, Jan 30, 2018 at 1:08 AM, Chengguang Xu <cgxu519@icloud.com> wrote:
> Hi Ilya
>
> Is there a specific tree for ceph kernel client?
>
> I found below git repository is quite old.
>
> https://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git/

Yes, as noted in MAINTAINERS:

  git://github.com/ceph/ceph-client.git

Thanks,

                Ilya