From 6f2de1cc860a9263c7a4ad8d8253467d3c3fb540 Mon Sep 17 00:00:00 2001
From: global-integration-roller
 <global-integration-roller@fuchsia-infra.iam.gserviceaccount.com>
Date: Thu, 23 May 2024 19:30:26 +0000
Subject: [PATCH] [superproject] Roll scudo [scudo] Compute the default aligned
 pointer without tag (#92989)

https://github.com/llvm/llvm-project/pull/83493 slightly
changed the order of computation of block addresses and
pointers, causing the value of DefaultAlignedPtr to
include the MTE tag. Move this computation earlier so it
matches the old behavior.

This fixes a UBSan failure in Trusty:
secure os: UBSan: (overflow:-)
external/scudo/standalone/combined.h:1070:35
secure os: Details: unsigned integer overflow: 8988807738704 -
144124176883594576 cannot be represented in type 'uptr'

GitOrigin-RevId: 68d65af99a063e79222c790f5afcdcf2e58b38db
Original-Revision: 01bc3bce33d2f804df1828387577bef23fbd8c7d
Roller-URL: https://ci.chromium.org/b/8747120831581303473
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: I78b348eeae725db1367d1580aec2d1e21e5550d0
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1053852
---
 third_party/scudo/src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/scudo/src b/third_party/scudo/src
index ed22bf262875..01bc3bce33d2 160000
--- a/third_party/scudo/src
+++ b/third_party/scudo/src
@@ -1 +1 @@
-Subproject commit ed22bf262875e3826259f5b65d9825c80b4cec84
+Subproject commit 01bc3bce33d2f804df1828387577bef23fbd8c7d