diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
| commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
| tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/ipv4/ip_sockglue.c | |
| parent | f5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff) | |
| parent | 159d83363b629c91d020734207c1bc788b96af5a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index d6e76f5229c..d8adfd4972e 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
| @@ -1133,7 +1133,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, | |||
| 1133 | } | 1133 | } |
| 1134 | release_sock(sk); | 1134 | release_sock(sk); |
| 1135 | 1135 | ||
| 1136 | if (len < sizeof(int) && len > 0 && val>=0 && val<255) { | 1136 | if (len < sizeof(int) && len > 0 && val>=0 && val<=255) { |
| 1137 | unsigned char ucval = (unsigned char)val; | 1137 | unsigned char ucval = (unsigned char)val; |
| 1138 | len = 1; | 1138 | len = 1; |
| 1139 | if (put_user(len, optlen)) | 1139 | if (put_user(len, optlen)) |