Messages in this thread Patch in this message | | | Date | Tue, 3 Nov 2009 15:09:54 -0500 | From | Andres Salomon <> | Subject | [PATCH] drm: replace DRM_COPY macro w/ a function |
| |
On Mon, 2 Nov 2009 23:41:24 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> On Mon, 19 Oct 2009 01:37:08 -0400 Andres Salomon > <dilinger@collabora.co.uk> wrote: > > > There are a few more macros in drmP.h that are unused; > > DRM_GET_PRIV_SAREA, DRM_ARRAY_SIZE, and DRM_WAITCOUNT can go away > > completely. > > > > Unfortunately, DRM_COPY is still used in one place, but we can at > > least move it to where it's used. It's an awful looking macro.. > > It would have been nice to fix the (valid) checkpatch warnings while > you were there. >
How about I do one better and replace the macro w/ a function?
From 535091717408e4ec4974e8f309212f61aabd1880 Mon Sep 17 00:00:00 2001 From: Andres Salomon <dilinger@collabora.co.uk> Date: Tue, 3 Nov 2009 15:03:52 -0500 Subject: [PATCH] drm: replace DRM_COPY macro w/ a function
Don't inline it; the compiler can figure it out. Comments added that are based upon my interpretation of the code. Hopefully they're correct. :)
Signed-off-by: Andres Salomon <dilinger@collabora.co.uk> --- drivers/gpu/drm/drm_drv.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 43297ca..ec0e3ae 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -368,14 +368,25 @@ module_exit(drm_core_exit); /** * Copy and IOCTL return string to user space */ -#define DRM_COPY(name, value) \ - len = strlen(value); \ - if (len > name##_len) len = name##_len; \ - name##_len = strlen(value); \ - if (len && name) { \ - if (copy_to_user(name, value, len)) \ - return -EFAULT; \ - } +static int drm_copy_field(char *buf, size_t *buf_len, const char *value) +{ + int len; + + /* don't overflow userbuf */ + len = strlen(value); + if (len > *buf_len) + len = *buf_len; + + /* let userspace know exact length of driver value (which could be + * larger than the userspace-supplied buffer) */ + *buf_len = strlen(value); + + /* finally, try filling in the userbuf */ + if (len && buf) + if (copy_to_user(buf, value, len)) + return -EFAULT; + return 0; +} /** * Get version information @@ -392,14 +403,13 @@ static int drm_version(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_version *version = data; - int len; version->version_major = dev->driver->major; version->version_minor = dev->driver->minor; version->version_patchlevel = dev->driver->patchlevel; - DRM_COPY(version->name, dev->driver->name); - DRM_COPY(version->date, dev->driver->date); - DRM_COPY(version->desc, dev->driver->desc); + drm_copy_field(version->name, &version->name_len, dev->driver->name); + drm_copy_field(version->date, &version->date_len, dev->driver->date); + drm_copy_field(version->desc, &version->desc_len, dev->driver->desc); return 0; } -- 1.5.6.5
| |