drm: check return values in drm_version
In drm_version, actually check the results from function calls so that we're not potentially passing garbage back to userspace. Signed-off-by: Andres Salomon <dilinger@collabora.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
committed by
Dave Airlie
parent
140a45fc32
commit
dad07ca717
@ -403,15 +403,21 @@ static int drm_version(struct drm_device *dev, void *data,
|
|||||||
struct drm_file *file_priv)
|
struct drm_file *file_priv)
|
||||||
{
|
{
|
||||||
struct drm_version *version = data;
|
struct drm_version *version = data;
|
||||||
|
int err;
|
||||||
|
|
||||||
version->version_major = dev->driver->major;
|
version->version_major = dev->driver->major;
|
||||||
version->version_minor = dev->driver->minor;
|
version->version_minor = dev->driver->minor;
|
||||||
version->version_patchlevel = dev->driver->patchlevel;
|
version->version_patchlevel = dev->driver->patchlevel;
|
||||||
drm_copy_field(version->name, &version->name_len, dev->driver->name);
|
err = drm_copy_field(version->name, &version->name_len,
|
||||||
drm_copy_field(version->date, &version->date_len, dev->driver->date);
|
dev->driver->name);
|
||||||
drm_copy_field(version->desc, &version->desc_len, dev->driver->desc);
|
if (!err)
|
||||||
|
err = drm_copy_field(version->date, &version->date_len,
|
||||||
|
dev->driver->date);
|
||||||
|
if (!err)
|
||||||
|
err = drm_copy_field(version->desc, &version->desc_len,
|
||||||
|
dev->driver->desc);
|
||||||
|
|
||||||
return 0;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user