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 2CF82C6FD1D for ; Mon, 20 Mar 2023 10:54:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B756C6B0078; Mon, 20 Mar 2023 06:54:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B25C26B007B; Mon, 20 Mar 2023 06:54:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C6066B007D; Mon, 20 Mar 2023 06:54:19 -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 891126B0078 for ; Mon, 20 Mar 2023 06:54:19 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4F2F580398 for ; Mon, 20 Mar 2023 10:54:19 +0000 (UTC) X-FDA: 80588967438.23.4C214C3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 22C981A0014 for ; Mon, 20 Mar 2023 10:54:15 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GP2CH2fv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679309656; 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=3tMCQDVzULAU4jofBrk3rYm7lirCI2ZuvfCFM/wFL08=; b=oYY3p2V97hTwxSbb2FLr2b6RzlaUmC6ap5pTrgtt+EJiu+zG/NSytrvaXq9wfQ5sLqsf3e QzCufJtuAW7kd4+0aJB6XZj1h/J+OFWRrCH/0e3Lm4C9AJQ1dDAIBndQ/+s7Y60M87fP5s oAnRaQmgL3onmJ920J6ZH+twT9zmGTU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GP2CH2fv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679309656; a=rsa-sha256; cv=none; b=m7HaznImIQQfeTdW0QGRNfyywM0KGG4GgDZE5wZ5RFF8eErTEQ1RI32EqxtFAFfeq2qHWx aM5XmnkQCuu9HQ8+CWYUKr4l9yPjRafHCuEymqkLYiu0AvApqZwkjKKefCK8QnrvHDb/4k a/GvJOGvylT4zw8qVpS1VJmv3fSyAY8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679309655; h=from:from: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; bh=3tMCQDVzULAU4jofBrk3rYm7lirCI2ZuvfCFM/wFL08=; b=GP2CH2fv3233vvImoMZ9DIEY6xhBWc+xYL2mgBwKqXEfZycJExQE7b3HzS3B7u0MP6J1F3 13jAKrZljqQIeoFPBVTSMeP/l1F0AEMueI33Bx0X7vLop6ecNSY2t8zEAymu7WgRLvg5NZ CMydGcfT8H1rLGiugmWJjJnLiNUCIZk= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-428-EqG-e8roPwyGarGRpjAOHw-1; Mon, 20 Mar 2023 06:54:14 -0400 X-MC-Unique: EqG-e8roPwyGarGRpjAOHw-1 Received: by mail-wm1-f70.google.com with SMTP id e5-20020a05600c4e4500b003edc5824521so2802335wmq.0 for ; Mon, 20 Mar 2023 03:54:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679309653; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3tMCQDVzULAU4jofBrk3rYm7lirCI2ZuvfCFM/wFL08=; b=L+ifPs21iLziagITF7/YxE/rEHQ/bJczRN+TVH04149Or3w+l5JmA+vYNwKVYUM8uS 9TSPpbbz6cq5kpQzalU0GDFnR5byErDjOolIXJa1Vz7hH/fs6ZE0n9aggDWh7PlolIzO FhM+2RcgklldGz9cIpmXxLgqSg1oma5wHcX5yOX3nTtibwNEFCQnGp5h4GiySIRKwP6M aZOSSBc50lqdI9uo6g3J1ZbglZgZm5hirkJ6iX0li4Aly9ChkyKCkqN0frm2UbshUWfQ y3CfVHKnoqfbBCN+nCMJUjKz9FMDswllMXtyvgQeucdDh7eyuV0cDjROlBx/+DjcmhnF mpag== X-Gm-Message-State: AO0yUKVD71A6Rt8Qusz8gujVBuNfu1hIZgugqAeba+Ws2ekFbdd6vbyN yB8kuN7MMFFSFdiT0K3+/bXJQYzQAxjdMOu4QYIgonPdWLpzjS+p4YvcCVYCAB9foS1AaI6LUjR BtTVyjnQm3XY= X-Received: by 2002:a7b:c8cc:0:b0:3ed:a5df:cf52 with SMTP id f12-20020a7bc8cc000000b003eda5dfcf52mr6949902wml.13.1679309653017; Mon, 20 Mar 2023 03:54:13 -0700 (PDT) X-Google-Smtp-Source: AK7set9d5YjWFuqRhbzglWL5WNl+1FjRpHrjEMlJMUOl8DuqOurWcJPI5w6n84yTGENjzP/cbJwiSw== X-Received: by 2002:a7b:c8cc:0:b0:3ed:a5df:cf52 with SMTP id f12-20020a7bc8cc000000b003eda5dfcf52mr6949885wml.13.1679309652719; Mon, 20 Mar 2023 03:54:12 -0700 (PDT) Received: from ?IPV6:2003:cb:c702:4100:a064:1ded:25ec:cf2f? (p200300cbc7024100a0641ded25eccf2f.dip0.t-ipconnect.de. [2003:cb:c702:4100:a064:1ded:25ec:cf2f]) by smtp.gmail.com with ESMTPSA id f20-20020a7bcd14000000b003e203681b26sm10131233wmj.29.2023.03.20.03.54.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Mar 2023 03:54:12 -0700 (PDT) Message-ID: <27b9cb5b-0118-f989-80c2-6a143a4232af@redhat.com> Date: Mon, 20 Mar 2023 11:54:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 To: Wupeng Ma , akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kuleshovmail@gmail.com, aneesh.kumar@linux.ibm.com References: <20230320024739.224850-1-mawupeng1@huawei.com> <20230320024739.224850-2-mawupeng1@huawei.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v4 1/4] mm/mlock: return EINVAL if len overflows for mlock/munlock In-Reply-To: <20230320024739.224850-2-mawupeng1@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 22C981A0014 X-Stat-Signature: cjjz9grqk31fqryx7modmessxfkiggui X-HE-Tag: 1679309655-447230 X-HE-Meta: U2FsdGVkX1+GnP5XV7/7r8RNEG+kKA5ThwpWbbBlbUio2DsxgrR8S7dKmuUM0ZXZ85qCIT0quD+lOd9FnR4oJh7tuUmr98WjATQ6zlDoF0s0XlT82NOMRpNLc2fy8Z7r0R0RRLXNlyTLTJKed3kgLp/NFtCLe+aTcrlx7h+Uya6UHinGawbN7X9lqzDjCDU56b5mWLLBRundYRzZ+iAVwGt2UyeUpTkAN2vKARrx84yYK7FYitdfqgYr+E9VlV2UD4KMgMqE+tCU1BmGscM5eXQg7jRQ9wTedZrQfe5f3eK9H5em5rmQiy0ThzPyFO10+Tu8QEV3IZVR/IpT65mJ6uvIEqFcApkY38H40IsLl0aLNZ22nl3fp55Y6O7BcbTVzSK6icZbf6o/lT7wrgGkemyNVgfR1he5DFOmzCegpkOTCCHryzZs5UQ7C6GIJIAkxeWcUXRRyIgVIx33wfakwgg5btiA0qxDzFlcB+W+VIiAkRomz759eOr0mWwcYWzZqxRnA+Nx+9NxBhzUo0Ac5HegJrXsx6h604r+tR5QUjDzlkWh8DwkDmB+jnu7l6bvGHwtx20UWIXyNNfLJXFi0UYNXWS/HdhDf3e+tQh0r6rwqBtWslpk+FweqgOiogV3kwzwiUUsQR35Wj+qAw4I1M0VWMqoSSdHTvkPUoubqX6JwGj+NhUPlcoF/vnprmsn4YKV8/8LYE0Yf4y2EtqbvHe6Sr6p4KTzgbitJJCgwky1RwH8rAQf/3jev4Kko9UNOL381b5M4puzRaufgF61nrGkr1OMTuRxHIfPfoywmdCdnVFCbGSXLX6X3yRtosxNkwI95ByPX4x/BhrWdxBVQclwAuAelbJDOPxPqIcxWLk4z8e/lYLjjeBsywg4VC+izAX/TK+32WgSzPzV+p2LqLLqml1lobO6AAUZdR0HlP3P9Fj5gkPNeiDafVG1+vy7rMDJfQWII/4zThZrxRP +8HqbLQD j13LH2qql4nyRfUlUqtW9Rk5GPVA8RGEhGRPjuplnmrLjHIMVDenEaiRYAlalsQhPy9SXNpcgh1TIiuzsiQbjvi0RBD/iIGpkVWrcJ7DB5vQ1ro7OxZpeEOdMha5Tqpe0T6JadcM4tz5EYuq5ixOqEQsnPubQGUbYpNK6RaOYZYaE738o8ZEG3TWuY1RsR0upt34FJcBKu9iU/Ey3Wm7l8NpRDuXVPMg47eizeqfb4TJHLbfO48ZdlPT1Q47z3LPFGAdKXAp5NgmYYtrwdDEOl8G/BSZ4I7KII5QLLe8ICtZ0EqBYtV23QRuhXIfjTkvLZuXs4AL41OSBm6/wS9eXSUnty0SFMxQTPYeqS1XQ1qqgWj/h/dSUxcE5QjyDyXRGZNGuNI5rCpTRQbVDys4aNDRyXHI4OcMN0TQQ8GVic0k2ENQ= 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: On 20.03.23 03:47, Wupeng Ma wrote: > From: Ma Wupeng > > While testing mlock, we have a problem if the len of mlock is ULONG_MAX. > The return value of mlock is zero. But nothing will be locked since the > len in do_mlock overflows to zero due to the following code in mlock: > > len = PAGE_ALIGN(len + (offset_in_page(start))); > > The same problem happens in munlock. > > Add new check and return -EINVAL to fix this overflowing scenarios since > they are absolutely wrong. Thinking again, wouldn't we reject mlock(0, ULONG_MAX) now as well? > > Signed-off-by: Ma Wupeng > --- > mm/mlock.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/mm/mlock.c b/mm/mlock.c > index 617469fce96d..eb68476da497 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -568,6 +568,7 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla > unsigned long locked; > unsigned long lock_limit; > int error = -ENOMEM; > + size_t old_len = len; > > start = untagged_addr(start); > > @@ -577,6 +578,9 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla > len = PAGE_ALIGN(len + (offset_in_page(start))); > start &= PAGE_MASK; > > + if (old_len != 0 && len == 0) if (old_len && !len) > + return -EINVAL; > + > lock_limit = rlimit(RLIMIT_MEMLOCK); > lock_limit >>= PAGE_SHIFT; > locked = len >> PAGE_SHIFT; > @@ -631,12 +635,16 @@ SYSCALL_DEFINE3(mlock2, unsigned long, start, size_t, len, int, flags) > SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) > { > int ret; > + size_t old_len = len; > > start = untagged_addr(start); > > len = PAGE_ALIGN(len + (offset_in_page(start))); > start &= PAGE_MASK; > > + if (old_len != 0 && len == 0) if (old_len && !len) > + return -EINVAL; > + > if (mmap_write_lock_killable(current->mm)) > return -EINTR; > ret = apply_vma_lock_flags(start, len, 0); -- Thanks, David / dhildenb