From nobody Mon Jan 17 13:35:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A49C81969294; Mon, 17 Jan 2022 13:35:43 +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 4JctFq30QWz4lG4; Mon, 17 Jan 2022 13:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642426543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uleOYJUpxNm+Wfa5+lvAjj6dzxRpPdSnLzBYHmopp5s=; b=gYwm+2Iknm1mBpL7T1wtzLfDxMSGa7XT/EXhuXE6EuYszzHXDoMvdyewIxhCcOvHXY9sRS /YrG/1/VKc0acBxUFC0u69QhbHBUWvOGDBpIkbyaYcWi96vJdyA7BTosm1tcn0HxjU3PVL TQitCCF/MiXoLVNXytWlquEqjVVvzKkUrzxBaJ5kmLYy8OLOqe9jajm4jQGGOloKkCbxJB ARtmYndSHhdPpCXjL4Jok04HZh2iQpgKlxpDWpTECqWHVa7AVuhmpYarF3WLkR8o2c0SUs 2/WtDNa469eE2pTR5ssMDSOiuZUdmAXKryUKIM/vD/zb5lXhj+he8tlQToxeIg== 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 483E768DD; Mon, 17 Jan 2022 13:35:43 +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 20HDZhT3091071; Mon, 17 Jan 2022 13:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HDZh7l091070; Mon, 17 Jan 2022 13:35:43 GMT (envelope-from git) Date: Mon, 17 Jan 2022 13:35:43 GMT Message-Id: <202201171335.20HDZh7l091070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: dc7526170d4c - main - posixshm: Report output buffer truncation from kern.ipc.posix_shm_list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc7526170d4cc62f35bafb25dd026399c612ed5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642426543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uleOYJUpxNm+Wfa5+lvAjj6dzxRpPdSnLzBYHmopp5s=; b=Psd848ZrUWFX5qH5SRE3r0NbUSR6FWAAy6GFgccHbK8AGwQ2b2q7IbP8GgigQd//EN0jc/ ku7HESkyYVeGieUn0GvQg+rwEpvzTzb+5gzqPjWg9oLH0dWAAQeV1SboD25sShzBpWRjNx s+nmn0y3Ri/s8Oy11qPPKDXcWiXKiFDQ1Oc3VgwOKMEyJmLpDQrHOqJZS/0NzVw1M4JJJ6 XEwJEipUbQvimqzKVq9RJlxZeaEB36OYECOEOwuF3RdLs2HQv0rKO3yi0lOJ/0q+ZN6HwY MYZnayi3XfrKlMaFF2xKzH4aM+4vIAx8jPRJIBD7YGF9thQTKqgiynlWp+N4Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642426543; a=rsa-sha256; cv=none; b=yi9y+ij/iKdQR1dFfEK58CFh8jPjLphx3AkXBy6BSSetB4ygkTRIKtkSm5xgaZAm8eIgJZ fWlyMz+zJKiqbOsHokIWnDsyEHaGPQ6mNsLCiXjp7ytN9/3FJVlwCs/3PJeMSFs9gXpISI 9gbN/+y76mNKl+6dXUrytacZwx2mwTGyd4fSsvVRRBpHs65tU6YV0RySOOFLUSCLlMZCjT itzgdkQaqFj91wX7Wze2DfHwUa+YrTiuUtzP2IVrMNo6YYqcLzvCcuqDf9a7v0BFKAaC0V Jyf8ZfYC1fVkUltwiXof5VDG2d2ipT0+FrX3U+FDTZLbaj9B6uwKMh1i5i/wXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dc7526170d4cc62f35bafb25dd026399c612ed5b commit dc7526170d4cc62f35bafb25dd026399c612ed5b Author: Mark Johnston AuthorDate: 2022-01-17 13:33:05 +0000 Commit: Mark Johnston CommitDate: 2022-01-17 13:35:19 +0000 posixshm: Report output buffer truncation from kern.ipc.posix_shm_list PR: 240573 Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33912 --- sys/kern/uipc_shm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 6fb083498e18..04c2c65af02e 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2052,9 +2052,6 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) if (error != 0) break; pack_kinfo(&kif); - if (req->oldptr != NULL && - kif.kf_structsize + curlen > req->oldlen) - break; error = sbuf_bcat(&sb, &kif, kif.kf_structsize) == 0 ? 0 : ENOMEM; if (error != 0)