Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754851AbdCTMc6 (ORCPT ); Mon, 20 Mar 2017 08:32:58 -0400 Received: from mail-ot0-f195.google.com ([74.125.82.195]:33693 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754044AbdCTMcv (ORCPT ); Mon, 20 Mar 2017 08:32:51 -0400 MIME-Version: 1.0 In-Reply-To: <1490011236.3600.5.camel@linux.intel.com> References: <20170320094335.1266306-1-arnd@arndb.de> <1490011236.3600.5.camel@linux.intel.com> From: Arnd Bergmann Date: Mon, 20 Mar 2017 13:02:26 +0100 X-Google-Sender-Auth: ZneHp0A_pvtOeNpJC27BACT7Lk8 Message-ID: Subject: Re: [PATCH 1/3] drm/i915: allocate mock file pointer dynamically To: Joonas Lahtinen Cc: Daniel Vetter , Jani Nikula , David Airlie , Chris Wilson , Tvrtko Ursulin , Matthew Auld , intel-gfx@lists.freedesktop.org, dri-devel , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1071 Lines: 30 On Mon, Mar 20, 2017 at 1:00 PM, Joonas Lahtinen wrote: > On ma, 2017-03-20 at 10:40 +0100, Arnd Bergmann wrote: >> diff --git a/drivers/gpu/drm/i915/selftests/mock_drm.c b/drivers/gpu/drm/i915/selftests/mock_drm.c >> index 113dec05c7dc..18514065c93d 100644 >> --- a/drivers/gpu/drm/i915/selftests/mock_drm.c >> +++ b/drivers/gpu/drm/i915/selftests/mock_drm.c >> @@ -32,15 +32,15 @@ static inline struct inode fake_inode(struct drm_i915_private *i915) >> struct drm_file *mock_file(struct drm_i915_private *i915) >> { >> > struct inode inode = fake_inode(i915); >> > - struct file filp = {}; >> > + struct file *filp = kzalloc(sizeof(struct file), GFP_KERNEL); >> > struct drm_file *file; >> > int err; >> > > filp = kzalloc(sizeof(*filp), GFP_KERNEL); > if (unlikely(!filp)) { > err = -ENOMEM; > goto err; > } > > And appropriate onion teardown in case drm_open fails, so that we don't > leak memory. Oops, of course you are right, sorry about that. Arnd