From patchwork Sat Oct 12 10:25:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gaowei Pu X-Patchwork-Id: 11186767 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68CF514E5 for ; Sat, 12 Oct 2019 10:26:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 27B272089F for ; Sat, 12 Oct 2019 10:26:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bMUZja03" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27B272089F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5250F8E0001; Sat, 12 Oct 2019 06:26:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4D5286B0005; Sat, 12 Oct 2019 06:26:25 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C3BC8E0001; Sat, 12 Oct 2019 06:26:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0248.hostedemail.com [216.40.44.248]) by kanga.kvack.org (Postfix) with ESMTP id 1BD556B0003 for ; Sat, 12 Oct 2019 06:26:25 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 99B6B181AC9BF for ; Sat, 12 Oct 2019 10:26:24 +0000 (UTC) X-FDA: 76034753088.08.copy00_8f37c9560912c X-Spam-Summary: 2,0,0,8251b6e78c700469,d41d8cd98f00b204,pugaowei@gmail.com,:akpm@linux-foundation.org:vbabka@suse.cz:,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3608:3865:3866:3868:3872:3874:4321:5007:6261:6653:7514:9036:9413:10004:11026:11473:11658:11914:12296:12297:12438:12517:12519:12555:12895:12986:13069:13255:13311:13357:13894:14181:14384:14394:14687:14721:21080:21444:21450:21451:21627:21666:30054:30070,0,RBL:209.85.214.195:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: copy00_8f37c9560912c X-Filterd-Recvd-Size: 4214 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Sat, 12 Oct 2019 10:26:24 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id u20so5661325plq.4 for ; Sat, 12 Oct 2019 03:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nubxQvzooG3xqOAkvCW/mgrS50yD/8svwdUIcIb/aj0=; b=bMUZja03elYEUfA1yoRTnnA3Y6yj02Ui0zGO9pqlSV1mzNt3Qg/4gKgJ7BlWy15F62 JZfeImVbs9Kw24kF2gk1333e+WlDZoQFpulKb5mcCwY2wPChMrPV5YCjNwHk8A897CWT ByGYYLlF/Es8v+0Wf4RHrvJKhuWGTobloYT4FT2YNigqtHjVum4UFECZR/6nD+3tKonV HIlAuQcBt3cZQD9qGNbZVTD3saRR+i6pIGYHRzqBcVch+1dMFFRIDuBT3wRV/5oTCc28 FF+SguQvcASRKl2BrsVOnZeScyPsSoTjlU+jUwMa05EytVYwcM/w6B2e22ngRE/+WXVl xqrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nubxQvzooG3xqOAkvCW/mgrS50yD/8svwdUIcIb/aj0=; b=ObJ3cdlsSFPBpAQwHddrN79FrtSPEjfG3IS7mGELacCvbTBcrGOybJXM2ypBYSxLsX cWwepcD9rjvN1Uq/htzwUGkECfltVRNw7BK57ImRQI2m6jkn+s8kG4inubyHaDnJiMOE tuSYisJnMsghtdbRC/MfOi3skVpYTj+6mZ4cFODVse5/4cdE7uLa8ivA1GwnZ5N+iqF+ YJ/aQivEvqRpap4Yn3uxP/5z4meduZ9SAYJJ5hBKdqG51nMTTz+I4KzVjV8zvFlxnHhB +iFEZW19KV7CRZyIIPhper7tTxZ4qXFyGKMmsoBYFaTMWKbiYkuNzrUgZd7RX5p49W1X NA+w== X-Gm-Message-State: APjAAAXnxP36HVJ4fc39/XUGfi2ISU2sU4C/0oHp6n19ERdmot6RQhaK 1Q/YOsbAh1GjSI5nBDKjxPs= X-Google-Smtp-Source: APXvYqzuLp4mDhP12axWjnFHiHl6Kd5nrn1gBAhdwBZM1TA0qgl17U+weQRU+FnDGFcBPbRyT42EAw== X-Received: by 2002:a17:902:8218:: with SMTP id x24mr18990545pln.139.1570875983156; Sat, 12 Oct 2019 03:26:23 -0700 (PDT) Received: from localhost.localdomain ([123.139.57.210]) by smtp.gmail.com with ESMTPSA id v3sm11377377pfn.18.2019.10.12.03.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 03:26:22 -0700 (PDT) From: Gaowei Pu To: Andrew Morton Cc: Vlastimil Babka , linux-mm@kvack.org Subject: [PATCH v2] mm/mmap.c: use IS_ERR_VALUE to check return value of get_unmapped_area Date: Sat, 12 Oct 2019 18:25:12 +0800 Message-Id: <20191012102512.28051-1-pugaowei@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: get_unmapped_area already cover the offset_in_page() check and returned with error ptr. So replace offset_in_page() with IS_ERR_VALUE(). Signed-off-by: Gaowei Pu V2: fix compile warnning. --- mm/mmap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 7e8c3e8ae75f..6aebfeb6a486 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1430,7 +1430,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, * that it represents a valid section of the address space. */ addr = get_unmapped_area(file, addr, len, pgoff, flags); - if (offset_in_page(addr)) + if (IS_ERR_VALUE(addr)) return addr; if (flags & MAP_FIXED_NOREPLACE) { @@ -2990,15 +2990,16 @@ static int do_brk_flags(unsigned long addr, unsigned long len, unsigned long fla struct rb_node **rb_link, *rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; + unsigned long mapped_addr; /* Until we need other flags, refuse anything except VM_EXEC. */ if ((flags & (~VM_EXEC)) != 0) return -EINVAL; flags |= VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; - error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED); - if (offset_in_page(error)) - return error; + mapped_addr = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED); + if (IS_ERR_VALUE(mapped_addr)) + return mapped_addr; error = mlock_future_check(mm, mm->def_flags, len); if (error)