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 v3] drivers/misc/sgi-gru: fix dereference of ERR_PTR
Date: Fri, 4 Sep 2015 09:56:20 +0530 [thread overview]
Message-ID: <1441340780-5634-1-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1441291851-29411-4-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 wait for some time and try again.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
v3: compact code for if logic
v2: on error retry after msleep(1).
v1: returned error.
drivers/misc/sgi-gru/grukservices.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 490b79a..7812e34 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -160,7 +160,12 @@ static void gru_load_kernel_context(struct gru_blade_state *bs, int blade_id)
down_write(&bs->bs_kgts_sema);
if (!bs->bs_kgts) {
- bs->bs_kgts = gru_alloc_gts(NULL, 0, 0, 0, 0, 0);
+ do {
+ bs->bs_kgts = gru_alloc_gts(NULL, 0, 0, 0, 0, 0);
+ if (!IS_ERR(bs->bs_kgts))
+ break;
+ msleep(1);
+ } while (true);
bs->bs_kgts->ts_user_blade_id = blade_id;
}
kgts = bs->bs_kgts;
--
1.9.1
next prev parent reply other threads:[~2015-09-04 4:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-03 14:50 [PATCH v2 1/5] drivers/misc/sgi-gru: add return on error Sudip Mukherjee
2015-09-03 14:50 ` [PATCH v2 2/5] drivers/misc/sgi-gru: make functions static Sudip Mukherjee
2015-09-03 14:50 ` [PATCH v2 3/5] drivers/misc/sgi-gru: remove always false condition Sudip Mukherjee
2015-09-03 14:50 ` [PATCH v2 4/5] drivers/misc/sgi-gru: fix dereference of ERR_PTR Sudip Mukherjee
2015-09-03 18:45 ` Dimitri Sivanich
2015-09-04 4:26 ` Sudip Mukherjee [this message]
2015-09-04 12:56 ` [PATCH v3] " Dimitri Sivanich
2015-09-03 14:50 ` [PATCH v2 5/5] drivers/misc/sgi-gru: remove unused variable Sudip Mukherjee
2015-09-03 18:22 ` Dimitri Sivanich
2015-09-03 18:21 ` [PATCH v2 1/5] drivers/misc/sgi-gru: add return on error Dimitri Sivanich
2015-09-15 7:50 ` Sudip Mukherjee
2015-09-21 2:26 ` Greg Kroah-Hartman
2015-09-21 5:34 ` Sudip Mukherjee
2015-09-21 5:36 ` Greg Kroah-Hartman
2015-09-21 6:53 ` Sudip Mukherjee
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=1441340780-5634-1-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®