From 2853dd0c2bdf096a431b076f4e9bb599263d5713 Mon Sep 17 00:00:00 2001
From: Mika Kukkonen <mikukkon@iki.fi>
Date: Wed, 21 Dec 2005 18:39:49 -0800
Subject: [PATCH] --- yaml --- r: 15291 b: refs/heads/master c:
 7eb1b3d372a53fe9220b9e3b579886db0fe2f897 h: refs/heads/master i:   15289:
 9921e060bcbf89c39b31fc8266f0643904d8ec2e   15287:
 deee24f76da2513517fd3877cd809c9b707ef511 v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e308365d3bcd..d148ffe0ddf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d77d59f6293438f25e0560172699c0d3e4ef5ac
+refs/heads/master: 7eb1b3d372a53fe9220b9e3b579886db0fe2f897
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 91e412b0ab00..67465b65abe4 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -753,6 +753,8 @@ static int vlan_ioctl_handler(void __user *arg)
 		break;
 	case GET_VLAN_REALDEV_NAME_CMD:
 		err = vlan_dev_get_realdev_name(args.device1, args.u.device2);
+		if (err)
+			goto out;
 		if (copy_to_user(arg, &args,
 				 sizeof(struct vlan_ioctl_args))) {
 			err = -EFAULT;
@@ -761,6 +763,8 @@ static int vlan_ioctl_handler(void __user *arg)
 
 	case GET_VLAN_VID_CMD:
 		err = vlan_dev_get_vid(args.device1, &vid);
+		if (err)
+			goto out;
 		args.u.VID = vid;
 		if (copy_to_user(arg, &args,
 				 sizeof(struct vlan_ioctl_args))) {
@@ -774,7 +778,7 @@ static int vlan_ioctl_handler(void __user *arg)
 			__FUNCTION__, args.cmd);
 		return -EINVAL;
 	};
-
+out:
 	return err;
 }