Subject: + gru-unlocking-should-be-conditional-in-gru_dump_context.patch added to -mm tree
To: dan.carpenter@xxxxxxxxxx,sivanich@xxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 31 Jan 2014 13:27:56 -0800
The patch titled
Subject: drivers/misc/sgi-gru/grukdump.c: unlocking should be conditional in gru_dump_context()
has been added to the -mm tree. Its filename is
gru-unlocking-should-be-conditional-in-gru_dump_context.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/gru-unlocking-should-be-conditional-in-gru_dump_context.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/gru-unlocking-should-be-conditional-in-gru_dump_context.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: drivers/misc/sgi-gru/grukdump.c: unlocking should be conditional in gru_dump_context()
I was reviewing this and noticed that unlocking should be conditional on
the error path. I've changed it to unlock and return directly since we
only do it once and it seems unlikely to change in the near future.
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Acked-by: Dimitri Sivanich <sivanich@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/misc/sgi-gru/grukdump.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN drivers/misc/sgi-gru/grukdump.c~gru-unlocking-should-be-conditional-in-gru_dump_context drivers/misc/sgi-gru/grukdump.c
--- a/drivers/misc/sgi-gru/grukdump.c~gru-unlocking-should-be-conditional-in-gru_dump_context
+++ a/drivers/misc/sgi-gru/grukdump.c
@@ -139,8 +139,11 @@ static int gru_dump_context(struct gru_s
ubuf += sizeof(hdr);
ubufcch = ubuf;
- if (gru_user_copy_handle(&ubuf, cch))
- goto fail;
+ if (gru_user_copy_handle(&ubuf, cch)) {
+ if (cch_locked)
+ unlock_cch_handle(cch);
+ return -EFAULT;
+ }
if (cch_locked)
ubufcch->delresp = 0;
bytes = sizeof(hdr) + GRU_CACHE_LINE_BYTES;
@@ -179,10 +182,6 @@ static int gru_dump_context(struct gru_s
ret = -EFAULT;
return ret ? ret : bytes;
-
-fail:
- unlock_cch_handle(cch);
- return -EFAULT;
}
int gru_dump_chiplet_request(unsigned long arg)
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
origin.patch
gru-unlocking-should-be-conditional-in-gru_dump_context.patch
drivers-scsi-megaraid-megaraid_mmc-missing-bounds-check-in-mimd_to_kioc.patch
gru-cleanup-gru_dump_context-a-little.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
