From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
Amir Shehata <amir.shehata@intel.com>,
Peng Tao <bergwolf@gmail.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH v3 09/15] staging/lustre/ptlrpc: Fix a crash when dereferencing NULL pointer
Date: Tue, 3 Dec 2013 21:58:47 +0800 [thread overview]
Message-ID: <1386079133-6459-10-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1386079133-6459-1-git-send-email-bergwolf@gmail.com>
From: Amir Shehata <amir.shehata@intel.com>
When a system runs out of memory and the function
ptlrpc_register_bulk() is called from ptl_send_rpc() the call to
LNetMEAttach() fails due to failure to allocate memory. This forces
the code into an error path, which most probably previously went
untested. The error path:
if (rc != 0) {
CERROR("%s: LNetMEAttach failed x"LPU64"/%d: rc = %dn",
desc->bd_export->exp_obd->obd_name, xid,
posted_md, rc);
break;
}
This print assumes that desc->bd_export is not NULL. However, it is.
In fact it is expected to be NULL. desc->bd_import is the correct
structure to access in this case.
Lustre-change: http://review.whamcloud.com/7121
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3585
Cc: stable <stable@vger.kernel.org> # 3.12
Signed-off-by: Amir Shehata <amir.shehata@intel.com>
Reviewed-by: Liang Zhen <liang.zhen@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
index 5f2aa7a..3c6bf23 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
@@ -180,7 +180,7 @@ int ptlrpc_register_bulk(struct ptlrpc_request *req)
LNET_UNLINK, LNET_INS_AFTER, &me_h);
if (rc != 0) {
CERROR("%s: LNetMEAttach failed x"LPU64"/%d: rc = %d\n",
- desc->bd_export->exp_obd->obd_name, xid,
+ desc->bd_import->imp_obd->obd_name, xid,
posted_md, rc);
break;
}
@@ -190,7 +190,7 @@ int ptlrpc_register_bulk(struct ptlrpc_request *req)
&desc->bd_mds[posted_md]);
if (rc != 0) {
CERROR("%s: LNetMDAttach failed x"LPU64"/%d: rc = %d\n",
- desc->bd_export->exp_obd->obd_name, xid,
+ desc->bd_import->imp_obd->obd_name, xid,
posted_md, rc);
rc2 = LNetMEUnlink(me_h);
LASSERT(rc2 == 0);
@@ -220,7 +220,7 @@ int ptlrpc_register_bulk(struct ptlrpc_request *req)
/* Holler if peer manages to touch buffers before he knows the xid */
if (desc->bd_md_count != total_md)
CWARN("%s: Peer %s touched %d buffers while I registered\n",
- desc->bd_export->exp_obd->obd_name, libcfs_id2str(peer),
+ desc->bd_import->imp_obd->obd_name, libcfs_id2str(peer),
total_md - desc->bd_md_count);
spin_unlock(&desc->bd_lock);
--
1.7.9.5
next prev parent reply other threads:[~2013-12-03 14:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 13:58 [PATCH v3 00/15] staging/lustre: sync with external tree, set 2 Peng Tao
2013-12-03 13:58 ` [PATCH v3 01/15] Revert "staging/lustre/nfs: writing to new files will return ENOENT" Peng Tao
2013-12-03 13:58 ` [PATCH v3 02/15] staging/lustre/llog: MGC to use OSD API for backup logs Peng Tao
2013-12-03 13:58 ` [PATCH v3 03/15] staging/lustre: constify uuid argument of obd_uuid2str Peng Tao
2013-12-03 13:58 ` [PATCH v3 04/15] staging/lustre: make obd_uuid_equals return bool Peng Tao
2013-12-03 13:58 ` [PATCH v3 05/15] staging/lustre/scrub: OI scrub on OST Peng Tao
2013-12-03 13:58 ` [PATCH v3 06/15] staging/lustre: make code align in lma_incompat Peng Tao
2013-12-03 13:58 ` [PATCH v3 07/15] staging/lustre/llite: don't check for O_CREAT in it_create_mode Peng Tao
2013-12-03 13:58 ` [PATCH v3 08/15] staging/lustre/build: fix compilation issue with is_compat_task Peng Tao
2013-12-03 13:58 ` Peng Tao [this message]
2013-12-03 13:58 ` [PATCH v3 10/15] staging/lustre/hsm: Add hsm_release feature Peng Tao
2013-12-03 13:58 ` [PATCH v3 11/15] staging/lustre/llite: extended attribute cache Peng Tao
2013-12-03 13:58 ` [PATCH v3 12/15] staging/lustre: clean up SET_BUT_UNUSED/UNUSED macros Peng Tao
2013-12-03 13:58 ` [PATCH v3 13/15] staging/lustre/pinger: remove never implemented suspend timeouts functionality Peng Tao
2013-12-03 13:58 ` [PATCH v3 14/15] staging/lustre/obdclass: remove unuse variables from lprocfs_stats_collect/clear Peng Tao
2013-12-03 13:58 ` [PATCH v3 15/15] staging/lustre/ptlrpc: better error handling in ptlrpcd_start Peng Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386079133-6459-10-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=amir.shehata@intel.com \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox