diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:59:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:59:22 -0800 |
| commit | 6db68906c1bb26066a32c8e5be0c523da41cf08f (patch) | |
| tree | cfbf4280e3c3ff14986811401e4d5c58c2108f3d /net/ipx | |
| parent | 2a7117ac7c120c085c56745f753166b821022858 (diff) | |
v2.4.1.4 -> v2.4.2
- sync up more with Alan
- Urban Widmark: smbfs and HIGHMEM fix
- Chris Mason: reiserfs tail unpacking fix ("null bytes in reiserfs files")
- Adan Richter: new cpia usb ID
- Hugh Dickins: misc small sysv ipc fixes
- Andries Brouwer: remove overly restrictive sector size check for
SCSI cd-roms
Diffstat (limited to 'net/ipx')
| -rw-r--r-- | net/ipx/af_ipx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 38edf6ec864f..0d0e6e00f371 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -1194,6 +1194,7 @@ static ipx_interface *ipxitf_auto_create(struct net_device *dev, atomic_set(&intrfc->refcnt, 1); MOD_INC_USE_COUNT; ipxitf_insert(intrfc); + dev_hold(dev); } return intrfc; @@ -1835,6 +1836,10 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname, return -EFAULT; len = min(len, sizeof(int)); + + if(len < 0) + return -EINVAL; + if (put_user(len, optlen)) return -EFAULT; |