[8021Q]: vlan_ioctl_handler: fix return value
net/8021q/vlan.c: In function 'vlan_ioctl_handler': net/8021q/vlan.c:700: warning: 'err' may be used uninitialized in this function The warning is incorrect, but from my reading this ioctl will return -EINVAL on success. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
79d310d01e
commit
3f5f4346b6
1 changed files with 2 additions and 0 deletions
|
@ -810,6 +810,7 @@ static int vlan_ioctl_handler(void __user *arg)
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
break;
|
break;
|
||||||
case GET_VLAN_REALDEV_NAME_CMD:
|
case GET_VLAN_REALDEV_NAME_CMD:
|
||||||
|
err = 0;
|
||||||
vlan_dev_get_realdev_name(dev, args.u.device2);
|
vlan_dev_get_realdev_name(dev, args.u.device2);
|
||||||
if (copy_to_user(arg, &args,
|
if (copy_to_user(arg, &args,
|
||||||
sizeof(struct vlan_ioctl_args))) {
|
sizeof(struct vlan_ioctl_args))) {
|
||||||
|
@ -818,6 +819,7 @@ static int vlan_ioctl_handler(void __user *arg)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GET_VLAN_VID_CMD:
|
case GET_VLAN_VID_CMD:
|
||||||
|
err = 0;
|
||||||
vlan_dev_get_vid(dev, &vid);
|
vlan_dev_get_vid(dev, &vid);
|
||||||
args.u.VID = vid;
|
args.u.VID = vid;
|
||||||
if (copy_to_user(arg, &args,
|
if (copy_to_user(arg, &args,
|
||||||
|
|
Loading…
Add table
Reference in a new issue