Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72ec5650 authored by Frediano Ziglio's avatar Frediano Ziglio Committed by Dave Airlie
Browse files

drm/qxl: Remove format string errors 



Enable format string checks for qxl_io_log and remove resulting warnings
which could lead to memory errors on different platform or just printing
wrong information.

Signed-off-by: default avatarFrediano Ziglio <fziglio@redhat.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent de0b523a

drivers/gpu/drm/qxl/qxl_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ int qxl_garbage_collect(struct qxl_device *qdev) 
		}

	}



	QXL_INFO(qdev, "%s: %lld\n", __func__, i);

	QXL_INFO(qdev, "%s: %d\n", __func__, i);



	return i;

}

drivers/gpu/drm/qxl/qxl_display.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev) 
	crc = crc32(0, (const uint8_t *)&qdev->rom->client_monitors_config,

		  sizeof(qdev->rom->client_monitors_config));

	if (crc != qdev->rom->client_monitors_config_crc) {

		qxl_io_log(qdev, "crc mismatch: have %X (%d) != %X\n", crc,

		qxl_io_log(qdev, "crc mismatch: have %X (%zd) != %X\n", crc,

			   sizeof(qdev->rom->client_monitors_config),

			   qdev->rom->client_monitors_config_crc);

		return 1;

drivers/gpu/drm/qxl/qxl_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ struct qxl_device { 
};



/* forward declaration for QXL_INFO_IO */

void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...);

__printf(2,3) void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...);



extern const struct drm_ioctl_desc qxl_ioctls[];

extern int qxl_max_ioctl;

drivers/gpu/drm/qxl/qxl_release.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ qxl_release_alloc(struct qxl_device *qdev, int type, 
		return handle;

	}

	*ret = release;

	QXL_INFO(qdev, "allocated release %lld\n", handle);

	QXL_INFO(qdev, "allocated release %d\n", handle);

	release->id = handle;

	return handle;

}