From owner-dev-commits-src-all@freebsd.org Tue Aug 24 15:49:33 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D957065A536; Tue, 24 Aug 2021 15:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GvD7d5VGkz3qD4; Tue, 24 Aug 2021 15:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BA8431E2; Tue, 24 Aug 2021 15:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17OFnXik007505; Tue, 24 Aug 2021 15:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17OFnXA0007504; Tue, 24 Aug 2021 15:49:33 GMT (envelope-from git) Date: Tue, 24 Aug 2021 15:49:33 GMT Message-Id: <202108241549.17OFnXA0007504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 5c1428d2c4a6 - main - uipc_shm: Handle offset on shm_size as if it is beyond shm_size MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c1428d2c4a63ae373181579b3af35d7e12f2e7c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2021 15:49:34 -0000 The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=5c1428d2c4a63ae373181579b3af35d7e12f2e7c commit 5c1428d2c4a63ae373181579b3af35d7e12f2e7c Author: Ka Ho Ng AuthorDate: 2021-08-24 14:39:43 +0000 Commit: Ka Ho Ng CommitDate: 2021-08-24 15:49:18 +0000 uipc_shm: Handle offset on shm_size as if it is beyond shm_size This avoids any unnecessary works in such case. Sponsored by: The FreeBSD Foundation Reviewed by: markj, kib Differential Revision: https://reviews.freebsd.org/D31655 --- sys/kern/uipc_shm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 60815ef24c26..c632c7f150df 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1915,8 +1915,8 @@ shm_deallocate(struct shmfd *shmfd, off_t *offset, off_t *length, int flags) pi = OFF_TO_IDX(off + PAGE_MASK); error = 0; - /* Handle the case when offset is beyond shm size */ - if ((off_t)len < 0) { + /* Handle the case when offset is on or beyond shm size. */ + if ((off_t)len <= 0) { *offset = shmfd->shm_size; *length = 0; return (0);