Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1217535

[PATCH 4/4] drivers/misc/sgi-gru: fix dereference of ERR_PTR

Show all headers | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] drivers/misc/sgi-gru: remove unused variable Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-02 13:30 +0200
  [PATCH 2/4] drivers/misc/sgi-gru: make functions static Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-02 13:30 +0200
    Re: [PATCH 2/4] drivers/misc/sgi-gru: make functions static Dimitri Sivanich <sivanich@sgi.com> - 2015-09-02 16:50 +0200
  [PATCH 3/4] drivers/misc/sgi-gru: remove always false condition Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-02 13:30 +0200
    Re: [PATCH 3/4] drivers/misc/sgi-gru: remove always false condition Dimitri Sivanich <sivanich@sgi.com> - 2015-09-02 16:50 +0200
  [PATCH 4/4] drivers/misc/sgi-gru: fix dereference of ERR_PTR Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-02 13:30 +0200
    Re: [PATCH 4/4] drivers/misc/sgi-gru: fix dereference of ERR_PTR Dimitri Sivanich <sivanich@sgi.com> - 2015-09-02 17:20 +0200
  Re: [PATCH 1/4] drivers/misc/sgi-gru: remove unused variable Dimitri Sivanich <sivanich@sgi.com> - 2015-09-02 16:50 +0200
    Re: [PATCH 1/4] drivers/misc/sgi-gru: remove unused variable Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-03 06:50 +0200
      Re: [PATCH 1/4] drivers/misc/sgi-gru: remove unused variable Dimitri Sivanich <sivanich@sgi.com> - 2015-09-03 15:20 +0200

csiph-web