linux-kernel - Re: [PATCH v2] nbd: Fix memory leak in nbd_add

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <db17d022-a53a-3781-63d4-c38d5cf5b1e4@huawei.com>
Date:   Mon, 22 Jun 2020 11:25:52 +0800
From:   "Zhengbin (OSKernel)" <zhengbin13@...wei.com>
To:     Markus Elfring <Markus.Elfring@....de>,
        <linux-block@...r.kernel.org>
CC:     <nbd@...er.debian.org>,
        Navid Emamdoost <navid.emamdoost@...il.com>,
        "Navid Emamdoost" <emamd001@....edu>, Kangjie Lu <kjlu@....edu>,
        Stephen McCamant <mccamant@...umn.edu>,
        Qiushi Wu <wu000273@....edu>,
        <kernel-janitors@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        Jens Axboe <axboe@...nel.dk>,
        Josef Bacik <josef@...icpanda.com>,
        Tuomas Tynkkynen <tuomas.tynkkynen@....fi>,
        Yi Zhang <yi.zhang@...wei.com>
Subject: Re: [PATCH v2] nbd: Fix memory leak in nbd_add_socket


On 2020/6/20 20:05, Markus Elfring wrote:
>> If we add first socket to nbd, config->socks is malloced but
>> num_connections does not update(nsock's allocation fail), the memory
>> is leaked. Cause in later nbd_config_put(), will only free config->socks
>> when num_connections is not 0.
>>
>> Let nsock's allocation first to avoid this.
> I suggest to improve this change description.
> Can an other wording variant be nicer?

em, how about this?


When adding first socket to nbd, if nsock's allocation fails, config->socks

is malloced but num_connections does not update, memory leak will 
occur(Function

nbd_config_put will only free config->socks when num_connections is not 0).

>
>
> …
>> +++ b/drivers/block/nbd.c
>> @@ -1037,21 +1037,22 @@  static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg,
>>   		return -EBUSY;
>>   	}
>>
>> +	nsock = kzalloc(sizeof(struct nbd_sock), GFP_KERNEL);
> Please use the following code variant.
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?id=4333a9b0b67bb4e8bcd91bdd80da80b0ec151162#n854
>
> +	nsock = kzalloc(sizeof(*nsock), GFP_KERNEL);
>
>
> …
>>   	if (!socks) {
>>   		sockfd_put(sock);
>> +		kfree(nsock);
>>   		return -ENOMEM;
>>   	}
> Please take another software design possibility into account.
>
>   	if (!socks) {
> -		sockfd_put(sock);
> -		return -ENOMEM;
> +		kfree(nsock);
> +		goto put_socket;
>   	}
>
>
> Regards,
> Markus
>
> .
>