lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <272182693.34271636.1406066794514.JavaMail.root@vmware.com> Date: Tue, 22 Jul 2014 15:06:34 -0700 (PDT) From: Jakob Bornecrantz <jakob@...are.com> To: Dave Jones <davej@...hat.com> Cc: Linux Kernel <linux-kernel@...r.kernel.org> Subject: Re: vmwgfx: remove identical branches ----- Original Message ----- > Commit 8b7de6aa8468: "vmwgfx: Rework fence event action" removed the > tv_sec & tv_usec arguments to vmw_event_fence_action_create, which meant > that both sides of the if/else are now exactly the same. > > Remove the flag check, and just do it unconditionally. > > Spotted with Coverity. > > Signed-off-by: Dave Jones <davej@...hat.com> Reviewed-by: Jakob Bornecrantz <jakob@...are.com> and thanks for the patch. Cheers, Jakob. > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > index 436b013b4231..a078e6bbaf0a 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > @@ -1124,16 +1124,10 @@ int vmw_fence_event_ioctl(struct drm_device *dev, > void *data, > > BUG_ON(fence == NULL); > > - if (arg->flags & DRM_VMW_FE_FLAG_REQ_TIME) > - ret = vmw_event_fence_action_create(file_priv, fence, > - arg->flags, > - arg->user_data, > - true); > - else > - ret = vmw_event_fence_action_create(file_priv, fence, > - arg->flags, > - arg->user_data, > - true); > + ret = vmw_event_fence_action_create(file_priv, fence, > + arg->flags, > + arg->user_data, > + true); > > if (unlikely(ret != 0)) { > if (ret != -ERESTARTSYS) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists