Re: [PATCH 1/3] drm/i915: allocate mock file pointer dynamically

On Mon, Mar 20, 2017 at 1:00 PM, Joonas Lahtinen joonas.lahtinen@linux.intel.com 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