From nobody Fri Jul 21 08:56:22 2023 X-Original-To: dev-commits-src-branches@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 4R6k1f4tmvz4dNvf; Fri, 21 Jul 2023 08:56:22 +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 4R6k1f3t2Xz4HKS; Fri, 21 Jul 2023 08:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689929782; 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=DnUs1ocCBoaIOJ/S0d0YpiYijKkPOYPimhcmW058ZxE=; b=s7jcOX1WpICBCd98fbFqhQ97Y7H6asb4yKsLItQ04oWvt/LZ9dy50wgEupbBa6skYsVaMe Kh3LG4Df1EPnhtJOIlAHqeiQC2gEJx4aYwM95zk88ughrn7P/vg//BNpB1sEomxmdDDWVu urUp+fFpmgh4PrNop/Z8J/g2PFt2B7X9SJnwKgvmIM1mw/ybmj3nf1bnbhmMAmbzoPLg6E C8d8u0tSiKFkmu/rvJw4katjRGBmg11s8HKHwWR8/Ki9by5sG3swZptd2m4RKTDiSuT9MO TTqZCVGH9AZ6OCCxwlOaaeAT0f/QoFm4w8BuRm6RkgdmdmtS8Xd6ipFwmNSeUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689929782; 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=DnUs1ocCBoaIOJ/S0d0YpiYijKkPOYPimhcmW058ZxE=; b=liUsoE/HADgKt7Q6irHITeCQS9apZdRhj4jfxg2l3fcP2Bdt3sYxTPW+m0EK1utFbUAqqa DvlX1AwIyuzN9U+w6pKGSsrtkRcgKpNSVOT5xB6rDQfJ3nFxtmgCSzk8lGxGeg8kv8wM82 xd9ZfglIr3cPaga3DTBsCuAkkM7qK8HRHxn92CR05PCnG0dkeELKR7l9o+Bd6nfsi5OT2R 7GtIrITbxkaofo0NwwFnV9DIlSauNYu6g3Vn3CIQ+RZx+IvDJoYJb0M0L/SQ8RWBScHL/D Nm0q/0RgzpHapcTBOXnkkPX8jQTe6NRLB8XjerX60taR14J40cQJuHZ5sWVUyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689929782; a=rsa-sha256; cv=none; b=h3wvbx5LsfNVH5ZhFePkhq22QSS8ev8fYWYLAVhaTKrm2ApyW+1RQcnVmBEIGk77rekhUo yycUKcWKwnw7m5LYzTQiTVR6P5ozeqLDNPec0bMii6y2ymKwBiJS4LBGM4aMjU8JevR/8D f6wUAJcznizZpZ53r49HgSj4T5G78w1z0jxTgrB5jxNbo5Hp2fhZfrWiOea90ZleTDaroD k6j1o8GLG+fvXkFtyaLtzCfiCKGnYhqoDcKkIjFBysEAYOWlWXT5TINUQM1N1/GXWUgchr mydbkDvyCxBhQS6dJOANyzvx6YWP4PFM4prPZMW6O/quXVY57l4YutElGXFo8A== 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 4R6k1f2mQvz162Q; Fri, 21 Jul 2023 08:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L8uMaw045664; Fri, 21 Jul 2023 08:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L8uM31045663; Fri, 21 Jul 2023 08:56:22 GMT (envelope-from git) Date: Fri, 21 Jul 2023 08:56:22 GMT Message-Id: <202307210856.36L8uM31045663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3b0dacf6fd13 - stable/13 - lib/libc/string/bcmp.c: fix integer overflow bug List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b0dacf6fd13cf8688402561192899507f46c276 Auto-Submitted: auto-generated The branch stable/13 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0dacf6fd13cf8688402561192899507f46c276 commit 3b0dacf6fd13cf8688402561192899507f46c276 Author: Robert Clausecker AuthorDate: 2023-07-12 18:23:21 +0000 Commit: Robert Clausecker CommitDate: 2023-07-21 08:54:08 +0000 lib/libc/string/bcmp.c: fix integer overflow bug bcmp() returned the number of remaining bytes when the main loop exits. In case of a match, this is zero, else a positive integer. On systems where SIZE_MAX > INT_MAX, the implicit conversion from size_t to int in the return value may cause the number of remaining bytes to overflow, becoming zero and falsely indicating a successful comparison. Fix the bug by always returning 0 on equality, 1 otherwise. PR: 272474 Approved by: emaste Reviewed by: imp MFC After: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41011 (cherry picked from commit 4da7282a1882fc03c99591c27d44a2e6dfda364b) --- lib/libc/string/bcmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c index 96cd49039eee..c42fe79ddb2f 100644 --- a/lib/libc/string/bcmp.c +++ b/lib/libc/string/bcmp.c @@ -51,7 +51,7 @@ bcmp(const void *b1, const void *b2, size_t length) p2 = (char *)b2; do if (*p1++ != *p2++) - break; + return (1); while (--length); - return (length); + return (0); }