From patchwork Thu Feb 17 03:09:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haris Iqbal X-Patchwork-Id: 12749263 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 492E5C433EF for ; Thu, 17 Feb 2022 03:09:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232384AbiBQDJy (ORCPT ); Wed, 16 Feb 2022 22:09:54 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:39186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232363AbiBQDJx (ORCPT ); Wed, 16 Feb 2022 22:09:53 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8048F23D5D9 for ; Wed, 16 Feb 2022 19:09:40 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id m22so3824034pfk.6 for ; Wed, 16 Feb 2022 19:09:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lwZR6LRtxho1iN3bcrm5HrqN1h4bgwlCvcBXmGprprc=; b=UB9jxIh+JpZuSZBMIzEiJlYoeOmPr1LMczVg2/YBS8dfvYx71OGpl6yzfWunAtWWZF JWfJTJ3kOY/lv5/iduEvZ4LARXFLm/11D+Sj+6cl84yxcS+8s7v8XFnO9S/MLH2/qlkv 7jDHwZWXhGZsaj7NT+xVSz3C2qGFvRJacCJatKMraWGuNhuDwro8ZTMf0ziiLnQM/miK 78giSnHmZTyomJl5ePtttGeOLUit4IcVSrhRKecwTBf+RHI+VIjdbSHgq8BM54eLGFvo IwtOERwSsyOr0kFrqtLcsEdruWxOfAnUiW+g2F1/D1eoD+gwEA9YvlXFnINwGmNLkUXB chrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lwZR6LRtxho1iN3bcrm5HrqN1h4bgwlCvcBXmGprprc=; b=7nUvFvwYSNaRC3yxaBZ6FMk1AHxZqrAUmc4AWMmqtPyNRO1faM5/txpF4/OqWb5S3A SIwc7Bu/SFfPnZYMAoceWYgBSJk5S2Pyf1ZGbXAWq0ijn5USXiHAJil2pboktA9N/x+n euCT2LqYC4gRK2oPm91htj5haKkNNngCnbkjhoW5+dR2cx1S5zAGco6EL+fwJyBVeVM8 m6RWvddww4MKinWNRw4CfvBgQU0eY0l57AXNRwUVY0TFwCeVv60oE5WWCpj7hcSWQFTi +vS8lqPULvuJosKUS1SZQfKIdT/T1Aq0DFIIBDcSFO3ooBEfamvn9rmElWZXQ+KrQOEs diLw== X-Gm-Message-State: AOAM5330z3229+y2UErZHPHHilnpK8VeA/Dk/jhk/spa7lUISQhvRnvn KxJf3XXrqlxmZoH8815yo/tIahCVk0kWiw== X-Google-Smtp-Source: ABdhPJxpUgT+tva5RiHJI2xPBOdQmA+i7DCoxn+35HmpCG0UmTRXAYEPdiz+dp0hSYWWUHh8pyxyYw== X-Received: by 2002:a63:4542:0:b0:340:e43c:3783 with SMTP id u2-20020a634542000000b00340e43c3783mr809233pgk.509.1645067378240; Wed, 16 Feb 2022 19:09:38 -0800 (PST) Received: from localhost.localdomain ([2401:4900:3ee7:b146:5f19:2be7:bec0:4145]) by smtp.gmail.com with ESMTPSA id oa10sm428756pjb.54.2022.02.16.19.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 19:09:37 -0800 (PST) From: Md Haris Iqbal To: linux-rdma@vger.kernel.org Cc: bvanassche@acm.org, leon@kernel.org, jgg@ziepe.ca, haris.iqbal@ionos.com, jinpu.wang@ionos.com, Miaoqian Lin Subject: [PATCH v4 1/2] RDMA/rtrs-clt: Fix possible double free in error case Date: Thu, 17 Feb 2022 04:09:28 +0100 Message-Id: <20220217030929.323849-1-haris.iqbal@ionos.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Callback function rtrs_clt_dev_release() for put_device() calls kfree(clt) to free memory. We shouldn't call kfree(clt) again, and we can't use the clt after kfree too. Replace device_register with device_initialize and device_add so that dev_set_name can be used appropriately. Move mutex_destroy to release function so it can be called in alloc_clt err path. Fixes: eab098246625 ("RDMA/rtrs-clt: Refactor the failure cases in alloc_clt") Reported-by: Miaoqian Lin Signed-off-by: Md Haris Iqbal Reviewed-by: Jack Wang --- v3>v4: Add Fixes line v2>v3 Fix dev_set_name v1>v2: Free clt->pcpu_path drivers/infiniband/ulp/rtrs/rtrs-clt.c | 37 ++++++++++++++------------ 1 file changed, 20 insertions(+), 17 deletions(-) base-commit: 2f1b2820b546c1eef07d15ed73db4177c0cf6d46 diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c index b696aa4abae4..d20bad345eff 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c @@ -2685,6 +2685,8 @@ static void rtrs_clt_dev_release(struct device *dev) struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess, dev); + mutex_destroy(&clt->paths_ev_mutex); + mutex_destroy(&clt->paths_mutex); kfree(clt); } @@ -2714,6 +2716,8 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num, return ERR_PTR(-ENOMEM); } + clt->dev.class = rtrs_clt_dev_class; + clt->dev.release = rtrs_clt_dev_release; uuid_gen(&clt->paths_uuid); INIT_LIST_HEAD_RCU(&clt->paths_list); clt->paths_num = paths_num; @@ -2730,43 +2734,41 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num, init_waitqueue_head(&clt->permits_wait); mutex_init(&clt->paths_ev_mutex); mutex_init(&clt->paths_mutex); + device_initialize(&clt->dev); - clt->dev.class = rtrs_clt_dev_class; - clt->dev.release = rtrs_clt_dev_release; err = dev_set_name(&clt->dev, "%s", sessname); if (err) - goto err; + goto err_put; + /* * Suppress user space notification until * sysfs files are created */ dev_set_uevent_suppress(&clt->dev, true); - err = device_register(&clt->dev); - if (err) { - put_device(&clt->dev); - goto err; - } + err = device_add(&clt->dev); + if (err) + goto err_put; clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj); if (!clt->kobj_paths) { err = -ENOMEM; - goto err_dev; + goto err_del; } err = rtrs_clt_create_sysfs_root_files(clt); if (err) { kobject_del(clt->kobj_paths); kobject_put(clt->kobj_paths); - goto err_dev; + goto err_del; } dev_set_uevent_suppress(&clt->dev, false); kobject_uevent(&clt->dev.kobj, KOBJ_ADD); return clt; -err_dev: - device_unregister(&clt->dev); -err: +err_del: + device_del(&clt->dev); +err_put: free_percpu(clt->pcpu_path); - kfree(clt); + put_device(&clt->dev); return ERR_PTR(err); } @@ -2774,9 +2776,10 @@ static void free_clt(struct rtrs_clt_sess *clt) { free_permits(clt); free_percpu(clt->pcpu_path); - mutex_destroy(&clt->paths_ev_mutex); - mutex_destroy(&clt->paths_mutex); - /* release callback will free clt in last put */ + + /* + * release callback will free clt and destroy mutexes in last put + */ device_unregister(&clt->dev); } From patchwork Thu Feb 17 03:09:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haris Iqbal X-Patchwork-Id: 12749264 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA063C433F5 for ; Thu, 17 Feb 2022 03:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232363AbiBQDJ7 (ORCPT ); Wed, 16 Feb 2022 22:09:59 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:39242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232386AbiBQDJ6 (ORCPT ); Wed, 16 Feb 2022 22:09:58 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82B0323F09D for ; Wed, 16 Feb 2022 19:09:45 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id v5-20020a17090a4ec500b001b8b702df57so8228453pjl.2 for ; Wed, 16 Feb 2022 19:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ta1RtR0RIND81SpFUwnxDMTUr0/xMQ0Rla3l7MJuCo0=; b=fxA8oS0+gloc28BNyz4wkG/z2TS36bWJC4S2RaRkvNy4+beAzJr4wMyI3q/AVy0P2i Lde+09BchzOGXhuRkYeotLhwwP6Y0UnmMgrVs4KqoxZuiTJpNzco2ipKemfzytFLLJIu sVgQY00BXOQMLsidmxhdH/9QgATD9Fucpric3wmyMzCBJ5lakXu8NzmARdvqMy/JxIR4 THzgZG3dB+hKvmmg70v1iBDgjRPnQy0e/HuxLp5YNYKqRFd4sCTOucmj7vH0kDO92Hai xAVaSI73kytNJES19GJ9aWoy3Hir71aIo32SQ/0TfNybVLlY2yvs6gaUhwE1Gq5CG7/J FYCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ta1RtR0RIND81SpFUwnxDMTUr0/xMQ0Rla3l7MJuCo0=; b=He7+SRsWK4KkVZMN1NAhyzPEDi8mlZkzyBrwCaA3R+ZBU4zr3FEbVrC+gulwp/9RJ2 RNy/n32zwjtdeFu0KHeNGjyxw31djTbcRkD993AzPQuhBCPPBVgvDZTzVBlSCoyuBjNA FfyDFm97TdakUuNHuAoU4IL4xQVZp3kH5WF91Yj+cMEW713jZ78X23lDoyvIhMtJqQpi l1ND4A9W/DUnhP6y/yevpRR+qQTGuj/EG2VPbs/666b6VGkRxNiUXngWBFEE7lLAmGd/ Xu/LJSgp3yekm6OOp88YcAcNCbnScn75vamLuo9iwrvBZ7mOURaNUTbOkweLJMlhIqUO a+Jw== X-Gm-Message-State: AOAM5326qYbxL4Rxn7pYvXtBrqxwOK25Ol0hXYEbc+3kqYV3dl6CdHE+ +7AC0fC2OVC+KU8ddK9ZUb9q8qSPoIlKQg== X-Google-Smtp-Source: ABdhPJx8Fn/LtVywXNh0w5OPc8Q4HfX0EnzoP2f4OeqjcUNtcXis2BRZqsCa63oXHoPrtq3LUcW0hw== X-Received: by 2002:a17:90b:1d04:b0:1b9:337d:490 with SMTP id on4-20020a17090b1d0400b001b9337d0490mr5146230pjb.144.1645067383996; Wed, 16 Feb 2022 19:09:43 -0800 (PST) Received: from localhost.localdomain ([2401:4900:3ee7:b146:5f19:2be7:bec0:4145]) by smtp.gmail.com with ESMTPSA id oa10sm428756pjb.54.2022.02.16.19.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 19:09:43 -0800 (PST) From: Md Haris Iqbal To: linux-rdma@vger.kernel.org Cc: bvanassche@acm.org, leon@kernel.org, jgg@ziepe.ca, haris.iqbal@ionos.com, jinpu.wang@ionos.com Subject: [PATCH v2 2/2] RDMA/rtrs-clt: Move free_permit from free_clt to rtrs_clt_close Date: Thu, 17 Feb 2022 04:09:29 +0100 Message-Id: <20220217030929.323849-2-haris.iqbal@ionos.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220217030929.323849-1-haris.iqbal@ionos.com> References: <20220217030929.323849-1-haris.iqbal@ionos.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Error path of rtrs_clt_open calls free_clt, where free_permit is called. This is wrong since error path of rtrs_clt_open does not need to call free_permit. Also, moving free_permits call to rtrs_clt_close, makes it more aligned with the call to alloc_permit in rtrs_clt_open. Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality") Signed-off-by: Md Haris Iqbal Reviewed-by: Jack Wang --- v1>v2: Add Fixes line drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c index d20bad345eff..c2c860d0c56e 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c @@ -2774,7 +2774,6 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num, static void free_clt(struct rtrs_clt_sess *clt) { - free_permits(clt); free_percpu(clt->pcpu_path); /* @@ -2896,6 +2895,7 @@ void rtrs_clt_close(struct rtrs_clt_sess *clt) rtrs_clt_destroy_path_files(clt_path, NULL); kobject_put(&clt_path->kobj); } + free_permits(clt); free_clt(clt); } EXPORT_SYMBOL(rtrs_clt_close);