From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Dimitri Sivanich <sivanich@sgi.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH 4/4] drivers/misc/sgi-gru: fix dereference of ERR_PTR
Date: Wed, 2 Sep 2015 16:54:58 +0530 [thread overview]
Message-ID: <1441193098-13885-4-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1441193098-13885-1-git-send-email-sudipm.mukherjee@gmail.com>
gru_alloc_gts() can fail and it can return ERR_PTR(errvalue). We should
not dereference it if it has returned error. And incase it has returned
error then just downgrade the write lock and exit.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/misc/sgi-gru/grukservices.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index a6fd773..369f7fe 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -161,6 +161,8 @@ static void gru_load_kernel_context(struct gru_blade_state *bs, int blade_id)
if (!bs->bs_kgts) {
bs->bs_kgts = gru_alloc_gts(NULL, 0, 0, 0, 0, 0);
+ if (IS_ERR(bs->bs_kgts))
+ goto err_gru_alloc_gts;
bs->bs_kgts->ts_user_blade_id = blade_id;
}
kgts = bs->bs_kgts;
@@ -184,6 +186,7 @@ static void gru_load_kernel_context(struct gru_blade_state *bs, int blade_id)
bs->kernel_cb = get_gseg_base_address_cb(vaddr, ctxnum, 0);
bs->kernel_dsr = get_gseg_base_address_ds(vaddr, ctxnum, 0);
}
+err_gru_alloc_gts:
downgrade_write(&bs->bs_kgts_sema);
}
--
1.9.1
next prev parent reply other threads:[~2015-09-02 11:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 11:24 [PATCH 1/4] drivers/misc/sgi-gru: remove unused variable Sudip Mukherjee
2015-09-02 11:24 ` [PATCH 2/4] drivers/misc/sgi-gru: make functions static Sudip Mukherjee
2015-09-02 14:44 ` Dimitri Sivanich
2015-09-02 11:24 ` [PATCH 3/4] drivers/misc/sgi-gru: remove always false condition Sudip Mukherjee
2015-09-02 14:45 ` Dimitri Sivanich
2015-09-02 11:24 ` Sudip Mukherjee [this message]
2015-09-02 15:03 ` [PATCH 4/4] drivers/misc/sgi-gru: fix dereference of ERR_PTR Dimitri Sivanich
2015-09-02 14:42 ` [PATCH 1/4] drivers/misc/sgi-gru: remove unused variable Dimitri Sivanich
2015-09-03 4:40 ` Sudip Mukherjee
2015-09-03 13:09 ` Dimitri Sivanich
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=1441193098-13885-4-git-send-email-sudipm.mukherjee@gmail.com \
--to=sudipm.mukherjee@gmail.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sivanich@sgi.com \
/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
all inboxes | Powered by JetHome®