From 6ec4963895ac0b0f353eb3fe2ad8a0134b69e8a2 Mon Sep 17 00:00:00 2001 From: Hal Rosenstock Date: Mon, 19 Sep 2005 13:51:01 -0700 Subject: [PATCH] --- yaml --- r: 9126 b: refs/heads/master c: eff4c654b1a4a5e5493fbdc3affa6dd48765c085 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/user_mad.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc2921068177..f8ceaa892c7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6577ae51cf52f5fb0e4a85e673dd7bf2d0074e3e +refs/heads/master: eff4c654b1a4a5e5493fbdc3affa6dd48765c085 diff --git a/trunk/drivers/infiniband/core/user_mad.c b/trunk/drivers/infiniband/core/user_mad.c index 7c2f03057ddb..a64d6b4dcc16 100644 --- a/trunk/drivers/infiniband/core/user_mad.c +++ b/trunk/drivers/infiniband/core/user_mad.c @@ -334,10 +334,11 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, ret = -EINVAL; goto err_ah; } - /* Validate that management class can support RMPP */ + + /* Validate that the management class can support RMPP */ if (rmpp_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_ADM) { hdr_len = offsetof(struct ib_sa_mad, data); - data_len = length; + data_len = length - hdr_len; } else if ((rmpp_mad->mad_hdr.mgmt_class >= IB_MGMT_CLASS_VENDOR_RANGE2_START) && (rmpp_mad->mad_hdr.mgmt_class <= IB_MGMT_CLASS_VENDOR_RANGE2_END)) { hdr_len = offsetof(struct ib_vendor_mad, data);