From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 602FBC48BE5 for ; Tue, 22 Jun 2021 20:39:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39969611CA for ; Tue, 22 Jun 2021 20:39:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229934AbhFVUls (ORCPT ); Tue, 22 Jun 2021 16:41:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45574 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbhFVUlq (ORCPT ); Tue, 22 Jun 2021 16:41:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624394370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g0MrG4+ll2NdZhlnJFDRRtUXoxi3BC214us5+iugMf4=; b=dMMgFNCcdG2ph1OghqEpEDx2g4DW/xiZPpbvDZ2ZJMUsLG5pmtBQegvNFHPD2+V695v8+8 xROkFRFViQdmJBagF+n2iOj4SiA3Odb6cy81gLdqmB4ZOzxg/yqDiY7qE0qBGxhCnLQ1Te JSkfj/rShXk38366OunRmFPhuztO4mA= Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-3AgWbK0mNdeNpBqjot6KIw-1; Tue, 22 Jun 2021 16:39:28 -0400 X-MC-Unique: 3AgWbK0mNdeNpBqjot6KIw-1 Received: by mail-oi1-f197.google.com with SMTP id h67-20020aca53460000b02901f9abff7c53so416064oib.1 for ; Tue, 22 Jun 2021 13:39:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g0MrG4+ll2NdZhlnJFDRRtUXoxi3BC214us5+iugMf4=; b=cHD4kKtzFY7S9KuibSGFQB1neH25JXZv3Hh/bAU9MglOcTEYwzRVq8q1829mvXJy9a KomF7a4eAFNZGDx8YjRdR1HeHKFILzYBIYL/ovYgZEe/4C3LliWlrXgtGLfgTUO84pR3 NRRKAi+wHsOhCPtDpoWIUhGdckHjcfKfSl8/t/EEcnbQbyxe1q5XvjpV6SwfWyakRCir 3bl5byvLYC38mIOoCQaJY02vxb6kj/UXM/4GUh+KEBrHf+o5tKvBfYkrWBB/CmBBlUIV hFnEa/fyJHblPvIR93rZ8tohMIsbfxvB9aPM4TpAj8GS2JdMhmpJkO//lYwu0AT7RCYC RRlA== X-Gm-Message-State: AOAM533O+cKR8IWfKdqul/N/mFBlm/wJAR75EtcVSH4EshyLlz+Pg/SU jp9APfGcUmrMGqSBur0EAsEXXG1uAOVt7IclFHgQ71ql5C3mpNqvhdYTcCY2u+WuZZ/BjT5qokN HuXUOCCHBbz3FhijB1et7SdKd X-Received: by 2002:a05:6808:2012:: with SMTP id q18mr505142oiw.1.1624394368052; Tue, 22 Jun 2021 13:39:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEtvh0TeVS8XIjLHgIJPcpwXe8Uxkzd568eyguTJwkGZ5onD2K6d+EchimlC6NR2wEOkVRIg== X-Received: by 2002:a05:6808:2012:: with SMTP id q18mr505135oiw.1.1624394367873; Tue, 22 Jun 2021 13:39:27 -0700 (PDT) Received: from redhat.com ([198.99.80.109]) by smtp.gmail.com with ESMTPSA id f63sm115130otb.36.2021.06.22.13.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Jun 2021 13:39:27 -0700 (PDT) Date: Tue, 22 Jun 2021 14:39:26 -0600 From: Alex Williamson To: Jason Gunthorpe Cc: Colin King , Kirti Wankhede , Greg Kroah-Hartman , kvm@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][next] vfio/mdpy: Fix memory leak of object mdev_state->vconfig Message-ID: <20210622143926.7880e698.alex.williamson@redhat.com> In-Reply-To: <20210622185824.GU1096940@ziepe.ca> References: <20210622183710.28954-1-colin.king@canonical.com> <20210622185824.GU1096940@ziepe.ca> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Jun 2021 15:58:24 -0300 Jason Gunthorpe wrote: > On Tue, Jun 22, 2021 at 07:37:10PM +0100, Colin King wrote: > > From: Colin Ian King > > > > In the case where the call to vfio_register_group_dev fails the error > > return path kfree's mdev_state but not mdev_state->vconfig. Fix this > > by kfree'ing mdev_state->vconfig before returning. > > > > Addresses-Coverity: ("Resource leak") > > Fixes: 437e41368c01 ("vfio/mdpy: Convert to use vfio_register_group_dev()") > > Signed-off-by: Colin Ian King > > samples/vfio-mdev/mdpy.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c > > index 7e9c9df0f05b..393c9df6f6a0 100644 > > +++ b/samples/vfio-mdev/mdpy.c > > @@ -261,6 +261,7 @@ static int mdpy_probe(struct mdev_device *mdev) > > > > ret = vfio_register_group_dev(&mdev_state->vdev); > > if (ret) { > > + kfree(mdev_state->vconfig); > > kfree(mdev_state); > > return ret; > > } > > Thanks Colin, looks right > > Alex, this is in your hch-mdev-direct-v4 branch can you squash or > whatever? > > Though if we are touching this I prefer the below: Discrete fix above as a follow-up patch and later add the below as an exit path cleanup, if you'd like to post it separately, seems like the way to go to me. Thanks, Alex > diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c > index 7e9c9df0f05bac..868a0e7fa90e98 100644 > --- a/samples/vfio-mdev/mdpy.c > +++ b/samples/vfio-mdev/mdpy.c > @@ -235,17 +235,16 @@ static int mdpy_probe(struct mdev_device *mdev) > > mdev_state->vconfig = kzalloc(MDPY_CONFIG_SPACE_SIZE, GFP_KERNEL); > if (mdev_state->vconfig == NULL) { > - kfree(mdev_state); > - return -ENOMEM; > + ret = -ENOMEM; > + goto err_state; > } > > fbsize = roundup_pow_of_two(type->width * type->height * type->bytepp); > > mdev_state->memblk = vmalloc_user(fbsize); > if (!mdev_state->memblk) { > - kfree(mdev_state->vconfig); > - kfree(mdev_state); > - return -ENOMEM; > + ret = -ENOMEM; > + goto err_vconfig; > } > dev_info(dev, "%s: %s (%dx%d)\n", __func__, type->name, type->width, > type->height); > @@ -260,12 +259,17 @@ static int mdpy_probe(struct mdev_device *mdev) > mdpy_count++; > > ret = vfio_register_group_dev(&mdev_state->vdev); > - if (ret) { > - kfree(mdev_state); > - return ret; > - } > + if (ret) > + goto err_vconfig; > + > dev_set_drvdata(&mdev->dev, mdev_state); > return 0; > + > +err_vconfig: > + kfree(mdev_state->vconfig); > +err_state: > + kfree(mdev_state); > + return ret; > } > > static void mdpy_remove(struct mdev_device *mdev) >