From patchwork Tue Dec 12 12:04:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Vlad X-Patchwork-Id: 10106919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B347602C2 for ; Tue, 12 Dec 2017 12:36:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 835F829B82 for ; Tue, 12 Dec 2017 12:36:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77CC229B97; Tue, 12 Dec 2017 12:36:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0604D29B82 for ; Tue, 12 Dec 2017 12:36:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65AE489F89; Tue, 12 Dec 2017 12:36:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 1897 seconds by postgrey-1.35 at gabe; Tue, 12 Dec 2017 12:35:59 UTC Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0052.outbound.protection.outlook.com [104.47.32.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21FC389F89 for ; Tue, 12 Dec 2017 12:35:59 +0000 (UTC) Received: from MWHPR03CA0056.namprd03.prod.outlook.com (2603:10b6:301:3b::45) by DM2PR0301MB0734.namprd03.prod.outlook.com (2a01:111:e400:3c0d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Tue, 12 Dec 2017 12:04:21 +0000 Received: from BY2FFO11FD024.protection.gbl (2a01:111:f400:7c0c::146) by MWHPR03CA0056.outlook.office365.com (2603:10b6:301:3b::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Tue, 12 Dec 2017 12:04:21 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; ffwll.ch; dkim=none (message not signed) header.d=none;ffwll.ch; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD024.mail.protection.outlook.com (10.1.15.213) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.282.5 via Frontend Transport; Tue, 12 Dec 2017 12:04:14 +0000 Received: from fsr-ub1664-140.ea.freescale.net (fsr-ub1664-140.ea.freescale.net [10.171.73.81]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vBCC4EUB032720; Tue, 12 Dec 2017 05:04:15 -0700 From: Marius Vlad To: Subject: [PATCH] drm/drm_lease: Do not call drm_master_put() twice in case drm_lease_create() fails Date: Tue, 12 Dec 2017 14:04:14 +0200 Message-ID: <20171212120414.8675-1-marius-cristian.vlad@nxp.com> X-Mailer: git-send-email 2.9.3 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131575538549781963; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(7966004)(336005)(39380400002)(39860400002)(376002)(346002)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(50466002)(316002)(2906002)(16586007)(86362001)(106466001)(50226002)(4326008)(2351001)(8676002)(48376002)(47776003)(105606002)(305945005)(104016004)(8936002)(53936002)(81166006)(54906003)(356003)(85426001)(498600001)(36756003)(77096006)(6916009)(1076002)(81156014)(51416003)(5660300001)(68736007)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0734; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD024; 1:aYY/sHQdBKOzEpYRJArZbcLAie2S/gPA1A+hyuBkJ6oqSUzp/AQsszbPN5Fi2U1ekl6JxwFfEIvTaux0aXOqsvkYGhYIWLHX1kYwbHnlzdbHFa3tnScEWfgZTGuQ+Okt MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b28a2f06-ef75-4d41-f5cb-08d5415876da X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603307); SRVR:DM2PR0301MB0734; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 3:R/f7yTeriv41guuomIAdmihSYcelW+17dl64vhDQy0JuO13kKZOJCBr7TU4ojIHJulz6F9gEtnrr+cyP5EdkTu53RuRiMtFc3neXohIQgVWY1NZE79TzIDi2RhA45g3eh7s8KFu0tT3qB8kfwnHZSnbL8OQ6m+GlmTv9xjIltUlSsBDErSVH74Xyt/8y6yYCRS0pYO+gFCOrq8L8uJh5r9Td3OXOs0BTD7E6V7E1RhvcPHRixXZni9mvydre+J9UYw+jM0FI7HEmES1QYSym6IxDFaDZTBs35DtfkmfguGuJBEl7PrUy8PgCStyIF5N0/SAR+pfUv+AYyWW7ZPYdpnGLGfV8M8kjAK4TitNnIJo=; 25:nvmENIzg0kV1BE4l8Tof4HJv+k02Kb1f5BLSYe87Ki0MmQIiKf11EELCJivmT1kpKUeLLIH0knbo3Ae+TzQbeQ9bcC2VdUWyVNXxJ9a9SIMWK0SB9LUB9kn1gyv7IAGnmxaEGLhyVP5ybCwRJDnGjaolrO2TlhQ/I6OaNe3F3FHZeRtPfDS2fZH93DfWsOLtaVHGELTZskqSlZcRYWcR1uUClsNw61qybUKb/9XAf6+DXnEfA0h16PTF/RRVNA3FYyJezakjxgvBbEPBAQL5GSY/6xckR70qKbsEjATSNot3nZ+0y6nwFra7VO0QdVfjZU3ojgfioFKNvQa+ecMegieU3K+npTujoM4XTPGLdwk= X-MS-TrafficTypeDiagnostic: DM2PR0301MB0734: X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 31:Wnz5+MHXBYFdX+ROmM6EFo1ypYQCyosL04yJgyPNziJoMPYJfww8a0Ex8U/3qDUJg+TQ8T2OGuhqHFvA6PmWMAeme/s3gJKOWAxp63riKFOZDu5rRhccgVeUjP9xhLqJnYiftkHVvFMOkqlWbI82HTZoJWQDI6szzkJ8VPiP+qhXZznfOFINBi+HQcSb3jPJN1SKB6X4RTgFNNTcIjRuesTbZRVPyJW4MO62ZI4durI=; 4:UYYmgy/iYIUXN6w97C9P9t5229Ybmk8yTV2PLtZkko9+4BB7qSyyOfD9l1mJEBZTfjoJMK4uUI4l5lTQJaRB4S3gndjZ9fWmNVlSxn0++z2FvNcvPqXLukEQSP6ig1QIdC9pCt55YhTJqBx2IV661udRy7kvy8ZDBZL9xNSZEQvIdkVzuzNOBjyQUy4e0ZWWbTx418FHpbscleuCvocSvmnoMycUkX0rpfLqSGSNGxCNj5R4aQdxVuY1ihLExfv1S302mEjqcOWClI176RmQwLRQgQpewkF/2ap5Ao1S/vfdpg8tPXs85V3R3vU383mk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231023)(6055026)(6096035)(20161123565025)(20161123556025)(20161123561025)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(201708071742011); SRVR:DM2PR0301MB0734; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:DM2PR0301MB0734; X-Forefront-PRVS: 051900244E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0734; 23:c560mD46EpJbnXHrj56KxtF3OOqaMjg1D5XkMO9?= =?us-ascii?Q?gnQ47AuLQh/CIsT4X6ZBzR4YzuvWvprBeXa27Qs0oVObMFTZuYpjfhEsG2Nn?= =?us-ascii?Q?XE/0+RiuNbZlGsFc2LPhvY2obrbDqMUJHLNiCSWzjZRM7KS0EL+Uzciu0Vbe?= =?us-ascii?Q?SVB/WLNI/VTnPoQ/lPgjrWDFpFx43F9W9OB4B5MJu/pOFOByUKvuBGx3iQ+f?= =?us-ascii?Q?p5z9xRZzk2uJJnRZipl9NnYFsWXMqMvOZylXeXYOGSS5IlD/3z7rw/8Mg3k2?= =?us-ascii?Q?i7od9A1X75p4KwjtW7bFBs0ObM5Y7XfJ0LIo/mFzz06iEvGeLpN2M9BAGW8i?= =?us-ascii?Q?59YD8CJqewSSV1HOCsuuWuscGSn0Sg7eGRTTyIMOzCktXxP/bW1+Zpazgz+B?= =?us-ascii?Q?octsYBTUG+B5MKZySKHLOo8tuA7R06o0MqP2mFojgXy8HPL87eVs2zTV1rNH?= =?us-ascii?Q?C3W6dcqXMPgHqrmq/A1Yohh0cPC5Q2IGMa6aaQUmgMm1qzqLnM4GwUGeL9eC?= =?us-ascii?Q?1RUN+n6M57ZMJqfYFMLe+TyQdEk+BQXzMlcH6pFYCb08mNaoMDxMwATT6UDE?= =?us-ascii?Q?0Jv3gVxb3sQeOLjPCTc7gWcFaBXiXz2gjcmmPelert89XOLtIPAqLgtbiobz?= =?us-ascii?Q?hrOjJG0iSYhzLT1rorV9cDFmQ4t8Ibw7s1+9r7Jxqyb3O5s46Vtg32Pj7fgH?= =?us-ascii?Q?9L47DdptnMbVGprAIh6vP9l9IirTi+y2II2v2maXrFykuvrRgLy9TgGjr+jY?= =?us-ascii?Q?L4LlqTxjRQlnlP9BoFGi8gfNKgb/g9eOiEvtx8UxZ7dsEra4MjuHXxJGMlg5?= =?us-ascii?Q?87O0DRFsOJ/PIxE0dHV3J8YV/Xsakkf80H0QWc3VOin95gm0oszWLN0550Il?= =?us-ascii?Q?ZsYmJo86M+5m4j0w8unUiq+Y6iN907GiAncYcQ4LzpP2Kj1qDIou2igE/Kfo?= =?us-ascii?Q?v+ynJ+4q6LROgPa9gOOwhRuTgIHe+Ml0ShiRDSzFaSt/ev5bYUKDEzq9mDTu?= =?us-ascii?Q?647nKX0gkNJRB5Y1Hk/OR0ZdC?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 6:n/yGxyJ3+pXdP3PNpbLkRisfd5vda9KgbdxZkmixdXXZJQC8ZLOxLCyShg5JXIwKAGtiO7HWvoZgpkgfYPJ/znQZn5FIrUqlPWVxchhwRaeEjFTjkJwqiCGQyQ5oYtULzG1O2zIroP2I1XhNOg1UdqvVg/F9ioFGleXX4tqbg2ihj2pDup5p7UUyBN9AoglIKli8F/qCCPJJhvxCGVDNcz8TDORH9GkvoqN5gzk5W3+wWNVTP2+7UwB1R98l6Pvo5CXG6cZ4vcEc/7Z/O896qAh/itviGSwMHKsaDECBydLIfHCe9SwJaTi1zHIyZRqB3EtLlRtLR5vp0VsrchXz781Kp1Xhr4ZA3zE9URgylgo=; 5:5KvojQcuyfuBNrLZxyGiQFcYJUpbViEo3iJcH+OmmkM5GXkPPidxqH+cDKglNVnm3kn5LYgViyNXaViqBFNQ+Ml6MwDwa/WweRzCZdAqdeTvrsmHdlLSHu9Mww1SMmYEmZ9XhETXAe2yR/kk7owZJuy+eMVwIUFSmd9+gEif73o=; 24:kUyNYjimDd0QXgHVh8y0E5O61GlFcux3LRkiES4bGv9UEAKfdW1iHyaFal1oveS2n/66CcHG+tkk5B8Ps0gHfYuQwBg2FRjAiJionIlMkyc=; 7:Gu2z2+j+XpGXRRnX8A8+4y0xaTJmyIXC3+q6ZMOpvCPSajpgRQQ5CXcKKVZM36NqGTqvMxbDjcG/wC/t9YjMEWF7s8Az7jFAAU5RbXYcnpu8ZZuNUEEwPGG2+sfRhcjwJ1cVxRdQzNBzzr5XQm7M7ZQ/27wWBqLM9Z2gx94O2GTJhXY0tr8sRvgv09Qn370dIbk6YfTDHg2nGmCVdVhTqcXY3Y0IFje0XDJ/8v3m/tPfhRAIU5UHTtgLPh19E+Os SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2017 12:04:14.7909 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b28a2f06-ef75-4d41-f5cb-08d5415876da X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0734 Cc: daniel.vetter@ffwll.ch, keithp@keithp.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This case can been seen when creating the lease with same objects passed. Signed-off-by: Marius Vlad --- drivers/gpu/drm/drm_lease.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index d1eb56a..ae57f33 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -254,8 +254,6 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr return lessee; out_lessee: - drm_master_put(&lessee); - mutex_unlock(&dev->mode_config.idr_mutex); return ERR_PTR(error);