linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging: zsmalloc: Ensure handle is never 0 on success
@ 2013-11-06  0:54 Olav Haugan
  2013-11-06  1:17 ` David Cohen
  2013-11-06  1:56 ` Greg KH
  0 siblings, 2 replies; 12+ messages in thread
From: Olav Haugan @ 2013-11-06  0:54 UTC (permalink / raw)
  To: gregkh; +Cc: ngupta, sjenning, linux-kernel, minchan, linux-arm-msm,
	Olav Haugan

zsmalloc encodes a handle using the page pfn and an object
index. On some hardware platforms the pfn could be 0 and this
causes the encoded handle to be 0 which is interpreted as an
allocation failure.

To prevent this false error we ensure that the encoded handle
will not be 0 when allocation succeeds.

Change-Id: Ifff930dcf254915b497aec5cb36f152a5e5365d6
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
---
 drivers/staging/zsmalloc/zsmalloc-main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c
index 523b937..0e32c0f 100644
--- a/drivers/staging/zsmalloc/zsmalloc-main.c
+++ b/drivers/staging/zsmalloc/zsmalloc-main.c
@@ -441,7 +441,7 @@ static void *obj_location_to_handle(struct page *page, unsigned long obj_idx)
 	}
 
 	handle = page_to_pfn(page) << OBJ_INDEX_BITS;
-	handle |= (obj_idx & OBJ_INDEX_MASK);
+	handle |= ((obj_idx + 1) & OBJ_INDEX_MASK);
 
 	return (void *)handle;
 }
@@ -451,7 +451,7 @@ static void obj_handle_to_location(unsigned long handle, struct page **page,
 				unsigned long *obj_idx)
 {
 	*page = pfn_to_page(handle >> OBJ_INDEX_BITS);
-	*obj_idx = handle & OBJ_INDEX_MASK;
+	*obj_idx = (handle & OBJ_INDEX_MASK) - 1;
 }
 
 static unsigned long obj_idx_to_offset(struct page *page,
-- 
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-11-07 22:57 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-06  0:54 [PATCH] staging: zsmalloc: Ensure handle is never 0 on success Olav Haugan
2013-11-06  1:17 ` David Cohen
2013-11-06 20:56   ` Nitin Gupta
2013-11-06 23:46     ` Olav Haugan
2013-11-06  1:56 ` Greg KH
2013-11-06 21:09   ` Nitin Gupta
2013-11-06 22:10     ` Greg KH
2013-11-06 23:46       ` Nitin Gupta
2013-11-07  3:05         ` Greg KH
2013-11-07  0:00   ` Olav Haugan
2013-11-07  3:06     ` Greg KH
2013-11-07 22:57       ` Olav Haugan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).