diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-12-05 11:46:56 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-01-28 08:45:37 +0100 |
| commit | 9b97383b789c1b2a8d4bc54d142a12f9d0a12aa1 (patch) | |
| tree | 27ddb52c4580e937ec73f7f6c21cd248ed25d8ae /drivers/gpu/drm/drm_mipi_dsi.c | |
| parent | 21773f16f2cb3c056051c679da542f0b494252e2 (diff) | |
| download | linux-9b97383b789c1b2a8d4bc54d142a12f9d0a12aa1.tar.bz2 | |
drm/mipi-dsi: Avoid potential NULL pointer dereference
The mipi_dsi_packet_create() function dereferences the msg pointer
before checking that it's valid. Move the dereference down to where it
is required to avoid potentially dereferencing a NULL pointer.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/drm_mipi_dsi.c')
| -rw-r--r-- | drivers/gpu/drm/drm_mipi_dsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index c0644bb865f2..2d5ca8eec13a 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -323,8 +323,6 @@ EXPORT_SYMBOL(mipi_dsi_packet_format_is_long); int mipi_dsi_create_packet(struct mipi_dsi_packet *packet, const struct mipi_dsi_msg *msg) { - const u8 *tx = msg->tx_buf; - if (!packet || !msg) return -EINVAL; @@ -353,8 +351,10 @@ int mipi_dsi_create_packet(struct mipi_dsi_packet *packet, packet->header[2] = (msg->tx_len >> 8) & 0xff; packet->payload_length = msg->tx_len; - packet->payload = tx; + packet->payload = msg->tx_buf; } else { + const u8 *tx = msg->tx_buf; + packet->header[1] = (msg->tx_len > 0) ? tx[0] : 0; packet->header[2] = (msg->tx_len > 1) ? tx[1] : 0; } |