[Intel-gfx] [dinq] Request to merge in padovan's fence fd fix
Daniel Vetter
daniel at ffwll.ch
Mon Jan 30 09:33:14 UTC 2017
On Fri, Jan 27, 2017 at 12:36:11PM -0800, Chad Versace wrote:
> Chris just pushed execbuffer fence fds to dinq. Could someone please get the
> below fix from airlied/drm-fixes into dinq? (What's the usual method here?
> Merge drm-fixes -> dinq, cherry-pick drm-fixes -> dinq, rebase?)
For testing, just test using the drm-tip tree, which has everything. For
merging patches that need both, ping the drm-misc/drm-intel maintainers
and we'll orchestrate some backmerge festival. We need that anyway for
other stuff, so should happen this week.
In general, for testing/consumption, running dinq is the wrong thing.
-Daniel
>
> Thanks
>
> commit 7e9081c5aac73b8a0bc22e0b3e7a12c3e9cf5256
> Author: Gustavo Padovan <gustavo.padovan at collabora.com>
> Date: Fri Jan 13 12:22:09 2017 -0200
>
> drm/fence: fix memory overwrite when setting out_fence fd
>
> Currently if the userspace declares a int variable to store the out_fence
> fd and pass it to OUT_FENCE_PTR the kernel will overwrite the 32 bits
> above the int variable on 64 bits systems.
>
> Fix this by making the internal storage of out_fence in the kernel a s32
> pointer.
>
> Reported-by: Chad Versace <chadversary at chromium.org>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.com>
> Fixes: beaf5af48034 ("drm/fence: add out-fences support")
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Rafael Antognolli <rafael.antognolli at intel.com>
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Acked-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Reviewed-and-Tested-by: Chad Versace <chadversary at chromium.org>
> Link: http://patchwork.freedesktop.org/patch/msgid/1484317329-9293-1-git-send-email-gustavo@padovan.org
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
More information about the Intel-gfx
mailing list