From: Yang Shi <yang.shi@linux.alibaba.com>
To: vbabka@suse.cz, kirill.shutemov@linux.intel.com,
mhocko@kernel.org, willy@infradead.org,
ldufour@linux.vnet.ibm.com, colin.king@canonical.com,
akpm@linux-foundation.org
Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2 -mm] mm: mremap: fix unsigned compare against 0 issue
Date: Fri, 5 Oct 2018 05:14:32 +0800 [thread overview]
Message-ID: <1538687672-17795-2-git-send-email-yang.shi@linux.alibaba.com> (raw)
In-Reply-To: <1538687672-17795-1-git-send-email-yang.shi@linux.alibaba.com>
Static analysis reported unsigned compare against 0 issue according to
Colin Ian King.
Defined an int temp variable to check the return value of __do_munmap().
Reported-by: Colin Ian King <colin.king@canonical.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
---
Andrew, this should be able to be folded into the original patch.
mm/mremap.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/mremap.c b/mm/mremap.c
index 3524d16..f9d5d1f 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -566,12 +566,14 @@ static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
* downgrade mmap_sem to read.
*/
if (old_len >= new_len) {
- ret = __do_munmap(mm, addr+new_len, old_len - new_len,
+ int retval;
+ retval = __do_munmap(mm, addr+new_len, old_len - new_len,
&uf_unmap, true);
- if (ret < 0 && old_len != new_len)
+ if (retval < 0 && old_len != new_len) {
+ ret = retval;
goto out;
/* Returning 1 indicates mmap_sem is downgraded to read. */
- else if (ret == 1)
+ } else if (retval == 1)
downgraded = true;
ret = addr;
goto out;
--
1.8.3.1
prev parent reply other threads:[~2018-10-04 21:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 21:14 [PATCH 1/2 -mm] mm: brk: fix unsigned compare against 0 issue Yang Shi
2018-10-04 21:14 ` Yang Shi [this message]
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=1538687672-17795-2-git-send-email-yang.shi@linux.alibaba.com \
--to=yang.shi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=colin.king@canonical.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=ldufour@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).