diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
| commit | 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 (patch) | |
| tree | 456799ad9fce41cdb2186ba3872c7a077ec3bd05 /drivers/infiniband/core/user_mad.c | |
| parent | d67e7ebb2a15bf0429c55f2fc1c4b02808367874 (diff) | |
| parent | 1b15688b31d8c88881102426279e8cc03953860b (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/infiniband/core/user_mad.c')
| -rw-r--r-- | drivers/infiniband/core/user_mad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 5ea741f47fc8..e73f81c22381 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c | |||
| @@ -312,7 +312,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, | |||
| 312 | int ret, length, hdr_len, copy_offset; | 312 | int ret, length, hdr_len, copy_offset; |
| 313 | int rmpp_active = 0; | 313 | int rmpp_active = 0; |
| 314 | 314 | ||
| 315 | if (count < sizeof (struct ib_user_mad)) | 315 | if (count < sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR) |
| 316 | return -EINVAL; | 316 | return -EINVAL; |
| 317 | 317 | ||
| 318 | length = count - sizeof (struct ib_user_mad); | 318 | length = count - sizeof (struct ib_user_mad); |