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;
Subject: Re: [PATCH][next] gpio: sim: Fix dereference of free'd pointer config
To:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        Andy Shevchenko <andy.shevchenko@gmail.com>,
        linux-gpio <linux-gpio@vger.kernel.org>,
        kernel-janitors@vger.kernel.org,
        LKML <linux-kernel@vger.kernel.org>
References: <20210427102427.11066-1-colin.king@canonical.com>
 <CAMpxmJX-Qkn_REScDJqHvBL6J8veFmzM5o2hmZVOu=iTAu1PUg@mail.gmail.com>
From:   Colin Ian King <colin.king@canonical.com>
Message-ID: <a5359f24-28e8-ebd6-4451-18027e82814d@canonical.com>
Date:   Tue, 27 Apr 2021 12:50:14 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <CAMpxmJX-Qkn_REScDJqHvBL6J8veFmzM5o2hmZVOu=iTAu1PUg@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 27/04/2021 12:33, Bartosz Golaszewski wrote:
> On Tue, Apr 27, 2021 at 12:24 PM Colin King <colin.king@canonical.com> wrote:
>>
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> The error return of config->id dereferences the kfree'd object config.
>> Fix this by using a temporary variable for the id to avoid this issue.
>>
>> Addresses-Coverity: ("Read from pointer aftyer free")
>> Fixes: a49d14276ac4 ("gpio: sim: allocate IDA numbers earlier")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>  drivers/gpio/gpio-sim.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c
>> index 2e2e6399e453..7bba5783a043 100644
>> --- a/drivers/gpio/gpio-sim.c
>> +++ b/drivers/gpio/gpio-sim.c
>> @@ -751,8 +751,10 @@ gpio_sim_config_make_item(struct config_group *group, const char *name)
>>
>>         config->id = ida_alloc(&gpio_sim_ida, GFP_KERNEL);
>>         if (config->id < 0) {
>> +               int id = config->id;
>> +
>>                 kfree(config);
>> -               return ERR_PTR(config->id);
>> +               return ERR_PTR(id);
>>         }
>>
>>         config_item_init_type_name(&config->item, name,
>> --
>> 2.30.2
>>
> 
> Thanks! Can you do something like this:
> 
> diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c
> index 2e2e6399e453..b21541c0b700 100644
> --- a/drivers/gpio/gpio-sim.c
> +++ b/drivers/gpio/gpio-sim.c
> @@ -744,20 +744,22 @@ static struct config_item *
>  gpio_sim_config_make_item(struct config_group *group, const char *name)
>  {
>   struct gpio_sim_chip_config *config;
> + int id;
> 
>   config = kzalloc(sizeof(*config), GFP_KERNEL);
>   if (!config)
>   return ERR_PTR(-ENOMEM);
> 
> - config->id = ida_alloc(&gpio_sim_ida, GFP_KERNEL);
> - if (config->id < 0) {
> + id = ida_alloc(&gpio_sim_ida, GFP_KERNEL);
> + if (id < 0) {
>   kfree(config);
> - return ERR_PTR(config->id);
> + return ERR_PTR(id);
>   }
> 
>   config_item_init_type_name(&config->item, name,
>      &gpio_sim_chip_config_type);
>   config->num_lines = 1;
> + config->id = id;
>   mutex_init(&config->lock);
> 
>   return &config->item;
> 
> 
> I think this looks more elegant without the local variable inside the if.

OK, good idea, V2 sent.
> 
> Bart
>