diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-30 05:53:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-30 05:53:13 +1000 |
| commit | e38f5164cacd3281b72c99ec0f5e4705ec1d1a55 (patch) | |
| tree | a84f57cd0b5d823f1601aa2e874362aa05b3291d | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
| parent | 79964dbaf662229253b281c42e82e2675a9d3b80 (diff) | |
Merge tag 'drm-misc-fixes-2017-08-28' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Driver Changes:
- bridge/sii8620: Fix out-of-bounds write to incorrect register
Cc: Maciej Purski <m.purski@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
* tag 'drm-misc-fixes-2017-08-28' of git://anongit.freedesktop.org/git/drm-misc:
drm/bridge/sii8620: Fix memory corruption
| -rw-r--r-- | drivers/gpu/drm/bridge/sil-sii8620.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 2d51a2269fc6..5131bfb94f06 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -597,9 +597,9 @@ static void sii8620_mt_read_devcap(struct sii8620 *ctx, bool xdevcap) static void sii8620_mt_read_devcap_reg_recv(struct sii8620 *ctx, struct sii8620_mt_msg *msg) { - u8 reg = msg->reg[0] & 0x7f; + u8 reg = msg->reg[1] & 0x7f; - if (msg->reg[0] & 0x80) + if (msg->reg[1] & 0x80) ctx->xdevcap[reg] = msg->ret; else ctx->devcap[reg] = msg->ret; |