From 0a242cd2844242505fd8ab95e02e58e1812dd9ad Mon Sep 17 00:00:00 2001
From: Chen Gang <gang.chen@asianux.com>
Date: Sat, 2 Feb 2013 15:57:53 +0800
Subject: [PATCH] --- yaml --- r: 354716 b: refs/heads/master c:
 b11b2e1bdd18ba5cd0dde075d440b3894e6ce64f h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/usb/core/devio.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aafae965be19..e6d8eace84cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f0760774711c957c395b31131b848043af98edf
+refs/heads/master: b11b2e1bdd18ba5cd0dde075d440b3894e6ce64f
diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c
index b78fbe222b72..4a863fdbdccd 100644
--- a/trunk/drivers/usb/core/devio.c
+++ b/trunk/drivers/usb/core/devio.c
@@ -40,6 +40,7 @@
 #include <linux/signal.h>
 #include <linux/poll.h>
 #include <linux/module.h>
+#include <linux/string.h>
 #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
 #include <linux/usb/hcd.h>	/* for usbcore internals */
@@ -1077,7 +1078,7 @@ static int proc_getdriver(struct dev_state *ps, void __user *arg)
 	if (!intf || !intf->dev.driver)
 		ret = -ENODATA;
 	else {
-		strncpy(gd.driver, intf->dev.driver->name,
+		strlcpy(gd.driver, intf->dev.driver->name,
 				sizeof(gd.driver));
 		ret = (copy_to_user(arg, &gd, sizeof(gd)) ? -EFAULT : 0);
 	}