From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB77D1CF9A for ; Thu, 22 Aug 2024 02:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724295187; cv=none; b=DC3smWP0CxRLI5RHNxUseNGRLTKiT/biJFJ3aTjbr9sqrmBPfloGZfaaeCMgUOXUaRyrLq/KJO2bYXh1KgHWM4T9Pq/h5V1QU0y9KkQT3gR+k7bycwzURvA1kQCtPmYhTOHCiMlzGjqWwpoDEKz9pICzboXfUAaX+beoDt1T/ZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724295187; c=relaxed/simple; bh=y4ffe8GF3xgvkI42UEatFR0qwcwdF4CxnvvGNdOhECQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=bzS7k1tN94SODoroNBcmt9Bonm4kLA/xo/4o2rrYsZfteaKEXx2rtD3jDmdrHUNn783M4R35rL4K/Xf7ywgG/wtdbTAD6xFQpLS0wlpcV4c6sA/0yAzCVPICZWvVHDxU/lecs1Ll2EPHBVdBEniUm+NCHzVFUPWokUXktM070QE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nlcev4Sn; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Nlcev4Sn" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-714262f1bb4so313525b3a.3 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=vger.kernel.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=Nlcev4SnPtb6r1Epzekg6dGR/GV7GZffpGlmeWg9j/wynY2R1g2xo47yniEClcvJfY T1tytiEVm/Gp3BDCVYGLUtiNZ+gw2KAW4rLbz7JZqYY3p87GA73UUgU0cH5izB3+4dPG V/LSmZX47MwOCZO+DVDQPDPLBw18QHBfV8lMY= 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=KNTEriQH/pynXWW+FUea8CVTHGeB7T1uoSwyvA2/iDbOzo+FixyH0hkSgmSqe5vGOZ VrwnSv1eN528pvWC9DV/hx/ZAs5klgbtwGpDdBOGNN+YWxrte/YtT/l+ClkGiYHKnCCU mnfBG+MlJFnMrPg3TG5hSuxIXfnM+Qlptoz31rNKN8XJkdgL7GterLn4YC8aOdz4WAlb bW2Wt2qrSb3t6t0GYNtKg6RxNaW1ojbBsUSO/LfU0OKlyR9XISsZ0jF39M0bMQuLgTpT VHv3migXpaqkfnWEEVvJFN3gJ39sIgsQ2aUcnq9rDSoYkHODGMUaCufZe9EAIegVQzGH MNJQ== X-Forwarded-Encrypted: i=1; AJvYcCWgGSN31g9rxyTUqnlilrrD9LG6IoJh67rjrt6FEzO/2jo1p8I/1BQ57/8kXH7m27CteU+Gtih1ujbPi9c=@vger.kernel.org X-Gm-Message-State: AOJu0YyVa5pvsOl+PDGrFIDgqotetAPO/bXq3vRRElgAiKrmJweDMi/V BxZfLsmfEdqHXaJUnzj39eghnYgU/0VpJx/z21yd49aT+kt4iNzkBLGyfQSsm60= 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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