diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-09-20 05:48:00 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-20 05:48:32 +0200 |
| commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
| tree | 251d969aa816dab5a62e6b36208b189b37de6534 /net/irda/irlan/irlan_common.c | |
| parent | svcrpc: cache deferral cleanup (diff) | |
| parent | SUNRPC: Fix the NFSv4 and RPCSEC_GSS Kconfig dependencies (diff) | |
| download | linux-c88739b373e4930ed082a607cb78bf82616fd076.tar.xz linux-c88739b373e4930ed082a607cb78bf82616fd076.zip | |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'net/irda/irlan/irlan_common.c')
| -rw-r--r-- | net/irda/irlan/irlan_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c index a788f9e9427d..6130f9d9dbe1 100644 --- a/net/irda/irlan/irlan_common.c +++ b/net/irda/irlan/irlan_common.c @@ -1102,7 +1102,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len) memcpy(&val_len, buf+n, 2); /* To avoid alignment problems */ le16_to_cpus(&val_len); n+=2; - if (val_len > 1016) { + if (val_len >= 1016) { IRDA_DEBUG(2, "%s(), parameter length to long\n", __func__ ); return -RSP_INVALID_COMMAND_FORMAT; } |