Module Name: src
Committed By: riz
Date: Mon Oct 1 19:53:26 UTC 2012
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-6]: drm_sysctl.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #579):
sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c: revision 1.8
fix the DRM string sysctls to use copyout() instead of strcat()
to deliver the data to the user buffer.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.14.1 \
src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.6 src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.6.14.1
--- src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.6 Wed Nov 10 05:22:55 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c Mon Oct 1 19:53:25 2012
@@ -164,7 +164,55 @@ int drm_sysctl_cleanup(struct drm_device
#ifdef __NetBSD__
#define SYSCTL_OUT(x, y, z) \
- (len+=z,(len<*oldlenp)?(strcat((char*)oldp, y),0):EOVERFLOW)
+ drm_sysctl_out(oldp, oldlenp, &len, y, z, &error, &retcode);
+
+static int
+drm_sysctl_out(void *oldp, size_t *oldlenp, size_t *lenp,
+ const char *buf, size_t buflen,
+ int *errorp, int *retcodep)
+{
+ size_t copylen;
+ int error = 0;
+
+ /*
+ * If there's room left in the user buffer,
+ * copy out as much data as there is room for.
+ */
+
+ if (*lenp < *oldlenp) {
+ copylen = MIN(buflen, *oldlenp - *lenp);
+ error = copyout(buf, (char *)oldp + *lenp, copylen);
+ if (error) {
+ *errorp = error;
+ }
+ } else {
+ copylen = 0;
+ }
+ *lenp += buflen;
+
+ /*
+ * If we didn't copy everything, remember that we should
+ * return ENOMEM at the end.
+ */
+
+ if (copylen < buflen && *errorp == 0) {
+ *errorp = ENOMEM;
+ }
+
+ /*
+ * If this is the final call (indicated by the buffer
+ * being the string terminator byte), return the
+ * total space required in *oldlenp and return
+ * the saved error in *retcodep.
+ */
+
+ if (buflen == 1 && *buf == 0) {
+ *oldlenp = *lenp;
+ *retcodep = *errorp;
+ }
+ return error;
+}
+
#endif
#define DRM_SYSCTL_PRINT(fmt, arg...) \
@@ -181,7 +229,8 @@ static int drm_name_info DRM_SYSCTL_HAND
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ size_t len = 0;
+ int error = 0;
#endif
char buf[128];
int retcode;
@@ -219,7 +268,8 @@ static int drm_vm_info DRM_SYSCTL_HANDLE
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ size_t len = 0;
+ int error = 0;
#endif
drm_local_map_t *map, *tempmaps;
const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "GEM", "TTM" };
@@ -284,7 +334,8 @@ static int drm_bufs_info DRM_SYSCTL_HAND
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ size_t len = 0;
+ int error = 0;
#endif
drm_device_dma_t *dma = dev->dma;
drm_device_dma_t tempdma;
@@ -346,7 +397,8 @@ static int drm_clients_info DRM_SYSCTL_H
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ size_t len = 0;
+ int error = 0;
#endif
struct drm_file *priv, *tempprivs;
char buf[128];
