| Revision | 6b56c2053649d588df0ab750f404ccd39664f87f (tree) |
|---|---|
| Zeit | 2006-04-15 19:13:30 |
| Autor | Mika Kukkonen <mikukkon@iki....> |
| Commiter | Willy TARREAU |
[PATCH] VLAN: Add two missing checks to vlan_ioctl_handler()
In vlan_ioctl_handler() the code misses couple checks for
error return values. The same patch was merged into 2.6.
Signed-of-by: Mika Kukkonen <mikukkon@iki.fi>
net/8021q/vlan.c (diff)| @@ -757,6 +757,8 @@ int vlan_ioctl_handler(unsigned long arg) | ||
| 757 | 757 | |
| 758 | 758 | case GET_VLAN_REALDEV_NAME_CMD: |
| 759 | 759 | err = vlan_dev_get_realdev_name(args.device1, args.u.device2); |
| 760 | + if (err) | |
| 761 | + goto out; | |
| 760 | 762 | if (copy_to_user((void*)arg, &args, |
| 761 | 763 | sizeof(struct vlan_ioctl_args))) { |
| 762 | 764 | err = -EFAULT; |
| @@ -765,6 +767,8 @@ int vlan_ioctl_handler(unsigned long arg) | ||
| 765 | 767 | |
| 766 | 768 | case GET_VLAN_VID_CMD: |
| 767 | 769 | err = vlan_dev_get_vid(args.device1, &vid); |
| 770 | + if (err) | |
| 771 | + goto out; | |
| 768 | 772 | args.u.VID = vid; |
| 769 | 773 | if (copy_to_user((void*)arg, &args, |
| 770 | 774 | sizeof(struct vlan_ioctl_args))) { |
| @@ -778,7 +782,7 @@ int vlan_ioctl_handler(unsigned long arg) | ||
| 778 | 782 | __FUNCTION__, args.cmd); |
| 779 | 783 | return -EINVAL; |
| 780 | 784 | }; |
| 781 | - | |
| 785 | +out: | |
| 782 | 786 | return err; |
| 783 | 787 | } |
| 784 | 788 |
Linux Kernel Documents
Fork