From: zhongjiang <zhongjiang@huawei.com>
To: <vitalywool@gmail.com>, <david@fromorbit.com>,
<sjenning@redhat.com>, <ddstreet@ieee.org>,
<akpm@linux-foundation.org>, <mhocko@kernel.org>,
<vbabka@suse.cz>
Cc: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>
Subject: [PATCH] z3fold: fix the potential encode bug in encod_handle
Date: Thu, 13 Oct 2016 11:33:05 +0800 [thread overview]
Message-ID: <1476329585-15428-1-git-send-email-zhongjiang@huawei.com> (raw)
From: zhong jiang <zhongjiang@huawei.com>
At present, zhdr->first_num plus bud can exceed the BUDDY_MASK
in encode_handle, it will lead to the the caller handle_to_buddy
return the error value.
The patch fix the issue by changing the BUDDY_MASK to PAGE_MASK,
it will be consistent with handle_to_z3fold_header. At the same time,
The code will much comprehensible to change the BUDDY_MASK to
BUDDIES_MAX in handle_to_buddy.
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
mm/z3fold.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/z3fold.c b/mm/z3fold.c
index 8f9e89c..5884b9e 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -169,7 +169,7 @@ static unsigned long encode_handle(struct z3fold_header *zhdr, enum buddy bud)
handle = (unsigned long)zhdr;
if (bud != HEADLESS)
- handle += (bud + zhdr->first_num) & BUDDY_MASK;
+ handle += (bud + zhdr->first_num) & PAGE_MASK;
return handle;
}
@@ -183,7 +183,7 @@ static struct z3fold_header *handle_to_z3fold_header(unsigned long handle)
static enum buddy handle_to_buddy(unsigned long handle)
{
struct z3fold_header *zhdr = handle_to_z3fold_header(handle);
- return (handle - zhdr->first_num) & BUDDY_MASK;
+ return (handle - zhdr->first_num) & BUDDIES_MAX;
}
/*
--
1.8.3.1
next reply other threads:[~2016-10-13 3:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-13 3:33 zhongjiang [this message]
2016-10-13 3:57 ` zhong jiang
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=1476329585-15428-1-git-send-email-zhongjiang@huawei.com \
--to=zhongjiang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=david@fromorbit.com \
--cc=ddstreet@ieee.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=sjenning@redhat.com \
--cc=vbabka@suse.cz \
--cc=vitalywool@gmail.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®