From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934194AbcJMDfP (ORCPT ); Wed, 12 Oct 2016 23:35:15 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:13689 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933767AbcJMDfH (ORCPT ); Wed, 12 Oct 2016 23:35:07 -0400 From: zhongjiang To: , , , , , , CC: , Subject: [PATCH] z3fold: fix the potential encode bug in encod_handle Date: Thu, 13 Oct 2016 11:33:05 +0800 Message-ID: <1476329585-15428-1-git-send-email-zhongjiang@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: zhong jiang 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 --- 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