From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C79DCC52D7C for ; Thu, 22 Aug 2024 02:53:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFF996B0118; Wed, 21 Aug 2024 22:53:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E88656B011E; Wed, 21 Aug 2024 22:53:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDC756B0119; Wed, 21 Aug 2024 22:53:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A88196B0117 for ; Wed, 21 Aug 2024 22:53:09 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 49D5D81271 for ; Thu, 22 Aug 2024 02:53:09 +0000 (UTC) X-FDA: 82478359698.01.BB45311 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf17.hostedemail.com (Postfix) with ESMTP id 4E4D340007 for ; Thu, 22 Aug 2024 02:53:06 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=google header.b="XGdfQ8/p"; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf17.hostedemail.com: domain of skhan@linuxfoundation.org designates 209.85.210.182 as permitted sender) smtp.mailfrom=skhan@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724295169; a=rsa-sha256; cv=none; b=QJihz7d/m8w+sia/7WE3+YJcLbM/Ixde9l48qqZDqN+SQ53GgedyNbU2LMGxZ+rglewM9z 3s+KfaWwAymTdtn42qdyGb/9TxZ3SfVNulwJBhuNKpd4c3Cvj9n2ORMF20l3qQwi/wpNdf Osun59u90HQJpx1gswzNz5yWNzofyyw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=google header.b="XGdfQ8/p"; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf17.hostedemail.com: domain of skhan@linuxfoundation.org designates 209.85.210.182 as permitted sender) smtp.mailfrom=skhan@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724295169; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DC7mjzc4Y16GOudBkNnMA83ey3IwQb6HkjKcEMJgqKA=; b=MMcvfp5itHxZgST6uwzGgAaQdjWMDIu/n57p2DDa2c2kqfsJ3YFNBZkcwZvGi1Vk74E4SY ZRhU/5KfReu8duPedCk2+65VFYiwb5SMVwJBFfb5QGM4VvtkrXz2zp91ll21riCwvtgVkQ 4LsE3A9mxI/IvIBq+ERBprkrlVAvzis= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7141feed424so294334b3a.2 for ; Wed, 21 Aug 2024 19:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1724295185; x=1724899985; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=DC7mjzc4Y16GOudBkNnMA83ey3IwQb6HkjKcEMJgqKA=; b=XGdfQ8/pvIXXLJFi2ZC+/Cju+HkmRs/qzwTG6cXSMuRu9rzkDVlcXN3DAl0sMgIQIS lAy2Z5Q/bxtZIbFWQexO8U+5ML3abCAsoUdxAFdDN1K9LWEyuJeplYWPVocw34dfYvxs XqgJuF2srVuHGQgMWRn1bViV1zPisGd7v833g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724295185; x=1724899985; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DC7mjzc4Y16GOudBkNnMA83ey3IwQb6HkjKcEMJgqKA=; b=ax6b5OXnNj30IEC2nwfigrbT5SXdJZy7vYoUxEaMbSKKyIF1BW0DWLOS48UVeUZ3sq cu3aM9ifkA8Sb1dNsuDqnuQz7GXXZgcerBV1aKm3nBVszWtkpqlEhQkp5PX2SaTlxRlI OLwJzGGeUqmGzpfy0q9Q/DIvsE9syExGuhX384sFPy6tLecp/oZ/TszEd+GHd/OL4mXT L30YBWNFULRgLO1VWH7l7GE58uHl6fNZgk/7Sbz7JpAn9+ktgAeNMQCPL3GYT4F9Ppo4 pdCdbZsuGDeW0HMejcYYXMgqy+9pJzLafUPj8VK6BIE9mDg8wh9GoLbUCNqyzHFvyDKU xaBw== X-Forwarded-Encrypted: i=1; AJvYcCVVlGkPxyuR1cxc5UQ5NRaoUQeMKUhW7Te4R1q2bnM1cjAPX984Eiv/5asGFkEPoBgpBz8jC1NzHQ==@kvack.org X-Gm-Message-State: AOJu0YybPeW5wNoSmCvMluQ4n9HCZLaHQrIK72t9Khry1geM48wWDfEe SI3KY2Pf8WLguwIpwSw0MvE3eU0StXdSEy8cqymvhUL3ZiQ76OSdZ/9KOi3uwGc= X-Google-Smtp-Source: AGHT+IHmRuY4nyoZnZlFxk1SM4jjgiQ3bjpA1j49OsPXP5U6a6yEt0H4vc/IfF8lt34mzlSi5EnjCA== X-Received: by 2002:a05:6a00:1788:b0:714:34c1:166a with SMTP id d2e1a72fcca58-714367483aamr603280b3a.21.1724295184741; Wed, 21 Aug 2024 19:53:04 -0700 (PDT) Received: from [172.20.0.208] ([218.188.70.188]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714342e10bfsm356238b3a.121.2024.08.21.19.53.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Aug 2024 19:53:04 -0700 (PDT) Message-ID: <0dc546e5-d164-48ba-b2bf-c83c98e648b4@linuxfoundation.org> Date: Wed, 21 Aug 2024 20:53:01 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] tools:mm:Check mmap based on return values To: Yang Ruibin <11162571@vivo.com>, Andrew Morton , Shuah Khan , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com, Shuah Khan References: <20240821035005.4423-1-11162571@vivo.com> Content-Language: en-US From: Shuah Khan In-Reply-To: <20240821035005.4423-1-11162571@vivo.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 4E4D340007 X-Rspamd-Server: rspam01 X-Stat-Signature: sq1iate79c1m8j4edub371u7wa6p9q9w X-HE-Tag: 1724295186-347661 X-HE-Meta: U2FsdGVkX1+PvNbtbLx8J12CCmAptnMIqGe/++9ViDEavEVjhtYRFpU2A3sWcODLuP806CxxJ8PX6S+r7hC/wPAdYbA2XaEPDrXddR0gnc7W8wYYS6Ei4QrpgU3ccY6UKoTa5yJeKUy8dsPLkxYOvoBZeU0SIyqxJjpXrqGMq+ZfZ9RvXU6Fpn2Z/lHBXthDqFOQuSZQmWpT0dq9IJ6qdEYgUkGtW6dJ+/LuiulNsw8x3E+dyOaG8XuWA8dLD/nUFrqPqRanI3EPskzqSMaJmTVKO/t+uQxcjHDZ22W6Qc3dq1zP2kmYoAXHTA8GQeVZJJsn8VsT4KVrJryGBuS+WE3ame0lkkJvBa7ajoI34PNEs+Ta7gZapls6WqX2Jsatb1COzX2k+Mo4j7xXPou6OQak29IanBUQP8QBIgJvdTgYYgVKQVwO116BWwZXqKes31eyj/jzLcxhd/qntv45r5zaDd3uHcVGe0ErZkcF8qaoXYkWE8Xfl+dX8PRUNSWyZz9HoAV5f1re2IjbPu/o9L78Wnr/MKymlDP57i4DkLm25GSWY+vHdmZb8JvYvsKm8/97fP3XwuiTzDw+rvpC3eW9snkFPkLws2XcNA0Enww3mnGtBaO6wv4CaLCCbb2nRXnqtilrADAP73EOkI6aI83jY70VJM7CXniKEGhOCJUOev16uJrqRGur+PnzpWEnilP5IQhSEcmyeO+9B5opDt98q5+f8MKN5ArfbyIXFYjJMxZERUnfc06y9ozArPcSNiqwLirIPBcvIEQEgnYgMaTKvP6fwKYXo88B+bHmRX34BaxB3goUS/70j10w6zp74O9i9KVFV4VpmELNAk3BSTV1HV+UBNU2lCvP/1B4frBAd/2Ige5I7zKhMycCNK3iqaBREdkgqqOp2rW1tf78MEjqi5HOurNCehMoLd7sFZWLFMUe+vNy3oolhABZwkh+cX5AQ49GHioguxzAYpm ouyAGIQu nSP+XzTkU2xXyNRtVP2CAc2eAjk9Ns2u3H2l+1vMJJ/INbP25j6UY8+//S4Deegsljx+PbCkWWMCxzyfEHI15+1xIsY3A9ulyCjWrkjizrFjKQvgUk+5Giw9n7msCl+Gi2dyWY8q5UrhRwjTcDbU90PZ/O7RoqWkwqGUZVZy9J5dpPh3EfVStYeRK/J+annttwqepuEqCxUyqYzcbHtBaO63IW9D0TGWfUf8Lx0iNEJkXzmR4NI21A3wd88Ny2n/OFZmApfNlFyHMh2TvmLuDAPEOeOR/c/iUwTLsWsV0s8KW5yFKh2kVsLRlHZGjiy3k1RZdGgw9luFZMJTllzc69Y+Gj6t4ZgR7vhr9p6E9dfXnPpgVb2JXV8iUXrMP8hzk0Uy3kCrdVh6pndmV9xbJolcEG/5aJamJb2MJLOYwlTxsb7ywZM5qPdqvVCFomyugs9VB X-Bogosity: Ham, tests=bogofilter, spamicity=0.000011, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 8/20/24 21:50, Yang Ruibin wrote: > To correctly detect whether mmap is successful, must use if > (map_ptr == MAP_FAILED)to avoid incorrectly handling a valid mapping. Add "Fix mmap() error paths to check for MAP_FAILED" at the end of the changelog Change short log to say "selftests:mm: Fix mmap() error paths to check for MAP_FAILED" selftests is the right subsystem tag for this change. "Fix" in the short log will make it easier for this change to be picked up by stables. > > Signed-off-by: Yang Ruibin <11162571@vivo.com> > --- > tools/testing/selftests/mm/ksm_tests.c | 2 +- > tools/testing/selftests/mm/madv_populate.c | 2 +- > tools/testing/selftests/mm/soft-dirty.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c > index b748c48908d9..dad54840f32e 100644 > --- a/tools/testing/selftests/mm/ksm_tests.c > +++ b/tools/testing/selftests/mm/ksm_tests.c > @@ -201,7 +201,7 @@ static void *allocate_memory(void *ptr, int prot, int mapping, char data, size_ > { > void *map_ptr = mmap(ptr, map_size, PROT_WRITE, mapping, -1, 0); > > - if (!map_ptr) { > + if (map_ptr == MAP_FAILED) { > perror("mmap"); Use ksft_exit_fail_msg("mmap failed\n") to be consistent with the rest. > return NULL; > } > diff --git a/tools/testing/selftests/mm/madv_populate.c b/tools/testing/selftests/mm/madv_populate.c > index ef7d911da13e..b89cb83ca5c5 100644 > --- a/tools/testing/selftests/mm/madv_populate.c > +++ b/tools/testing/selftests/mm/madv_populate.c > @@ -34,7 +34,7 @@ static void sense_support(void) > > addr = mmap(0, pagesize, PROT_READ | PROT_WRITE, > MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); > - if (!addr) > + if (addr == MAP_FAILED) > ksft_exit_fail_msg("mmap failed\n"); > > ret = madvise(addr, pagesize, MADV_POPULATE_READ); > diff --git a/tools/testing/selftests/mm/soft-dirty.c b/tools/testing/selftests/mm/soft-dirty.c > index bdfa5d085f00..4ccbc053bcce 100644 > --- a/tools/testing/selftests/mm/soft-dirty.c > +++ b/tools/testing/selftests/mm/soft-dirty.c > @@ -134,7 +134,7 @@ static void test_mprotect(int pagemap_fd, int pagesize, bool anon) > if (anon) { > map = mmap(NULL, pagesize, PROT_READ|PROT_WRITE, > MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); > - if (!map) > + if (map == MAP_FAILED) > ksft_exit_fail_msg("anon mmap failed\n"); > } else { > test_fd = open(fname, O_RDWR | O_CREAT, 0664); With the above fixed: Reviewed-by: Shuah Khan thanks, -- Shuah