From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6A3583858C78 for ; Mon, 18 Sep 2023 20:32:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6A3583858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695069139; 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; bh=LpVzVNCfqZlt1rDhGxiklsdBvV2ulXat8MqUPJV9lBE=; b=DK4CMYUR0UcS9jqlpU8UNdJ0AdxtZOR/w0guoqS19XvBVMSWYcm663TlHducx3SmdnlCXR DHCKa7VUyiUUGx1IZvfGLeNL85z4fiGcJ8YB6C0XSgEsph7ZIV8W+Hybm0Xm0oPnqqlrB3 zK9lFpgsXPgD1infP/daVGD3ocK5y0w= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-522-dIb6lFP1NTS1ZEuH_qs_oQ-1; Mon, 18 Sep 2023 16:32:17 -0400 X-MC-Unique: dIb6lFP1NTS1ZEuH_qs_oQ-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-63d0c38e986so51256626d6.1 for ; Mon, 18 Sep 2023 13:32:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695069137; x=1695673937; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LpVzVNCfqZlt1rDhGxiklsdBvV2ulXat8MqUPJV9lBE=; b=JFTWbGxxLsCJdcWWb1BGAZEDIMTktRQm/h2GV/mqNRHVIY1xzFvtR72wGwiV0ZaKvL 9SnUC/m8HmsAtNVs/S3S/YKpmmcbAz8lBm7FZaLHRuAm+WIZ97SRHzuxiOxD/pbsZRbX oHS7VYnpAGA4vlPp9NUgCmbte3vsSNBFR+cDzSOHpCitXqHAONC/V12r3FjEJHQx5j9U 5PgWnUtlHrAu2rPc2PxVzjOmccV0ri2fwHDj2i9RBLttD2TH9Go5iS37tNMl+bGTsXlQ deKhTnI7h/iC9lewEzYUrSCoGMeABSsNv4R+5q2uefonHmuGJJWfOh2xhU7/7OUSXm/2 nZlg== X-Gm-Message-State: AOJu0YwdYtGq78CG1JphXbBaYvehKG3FQV3YKN/Rc8FKoZXcDuOToNPE V/LI9BGceIfvIJEi1wxA+gbFumMiSlKkKTO574RL3ByUgmlqk29SP4grVc71/K63l/9Yx1zHdMt Sy1wHpSvGvDBb/2EPAVNhHLf8cqOKLDi6ypAbRlDuDzEw+QMCpdRtIrcHdTLPhRFmoyaUdW/uza 79slwK X-Received: by 2002:a0c:e1cf:0:b0:64a:a902:2c1e with SMTP id v15-20020a0ce1cf000000b0064aa9022c1emr9020020qvl.20.1695069136887; Mon, 18 Sep 2023 13:32:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+E2XHPJyuuO1AXXVkNLTwhkZyhCSYYDBnXQet9xyK25i2vTUVv/uwfX/0kKK/YeV76J+78g== X-Received: by 2002:a0c:e1cf:0:b0:64a:a902:2c1e with SMTP id v15-20020a0ce1cf000000b0064aa9022c1emr9020005qvl.20.1695069136477; Mon, 18 Sep 2023 13:32:16 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id s7-20020a05620a030700b0076ee973b9a7sm3407288qkm.27.2023.09.18.13.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 13:32:15 -0700 (PDT) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH] crypt: Remove alloca usage from __sha512_crypt_r Date: Mon, 18 Sep 2023 16:32:01 -0400 Message-ID: <20230918203213.2830034-1-josimmon@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Replace alloca usage with scratch_buffers to avoid potential stack overflow. --- crypt/sha512-crypt.c | 63 ++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/crypt/sha512-crypt.c b/crypt/sha512-crypt.c index d9c0de14d2..8a4cc380e3 100644 --- a/crypt/sha512-crypt.c +++ b/crypt/sha512-crypt.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -115,9 +116,16 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) /* Default number of rounds. */ size_t rounds = ROUNDS_DEFAULT; bool rounds_custom = false; - size_t alloca_used = 0; char *free_key = NULL; char *free_pbytes = NULL; + struct scratch_buffer sbuf; + scratch_buffer_init (&sbuf); + struct scratch_buffer salt_buf; + scratch_buffer_init (&salt_buf); + struct scratch_buffer p_bytes_buf; + scratch_buffer_init (&p_bytes_buf); + struct scratch_buffer s_bytes_buf; + scratch_buffer_init (&s_bytes_buf); /* Find beginning of salt string. The prefix should normally always be present. Just in case it is not. */ @@ -146,14 +154,11 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) { char *tmp; - if (__libc_use_alloca (alloca_used + key_len + __alignof__ (uint64_t))) - tmp = alloca_account (key_len + __alignof__ (uint64_t), alloca_used); - else - { - free_key = tmp = (char *) malloc (key_len + __alignof__ (uint64_t)); - if (tmp == NULL) - return NULL; - } + if (!scratch_buffer_set_array_size ( + &sbuf, 1, key_len + __align_of (uint64_t))) + return NULL; + + tmp = sbuf.data; key = copied_key = memcpy (tmp + __alignof__ (uint64_t) @@ -164,7 +169,13 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) if (((uintptr_t) salt) % __alignof__ (uint64_t) != 0) { - char *tmp = (char *) alloca (salt_len + __alignof__ (uint64_t)); + if (!scratch_buffer_set_array_size ( + &salt_buf, 1, salt_len + __alignof__ (uint64_t))) + { + scratch_buffer_free (&sbuf); + return NULL; + } + char *tmp = salt_buf.data; salt = copied_salt = memcpy (tmp + __alignof__ (uint64_t) - ((uintptr_t) tmp) % __alignof__ (uint64_t), @@ -177,7 +188,8 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) NSSLOWInitContext *nss_ictx = NSSLOW_Init (); if (nss_ictx == NULL) { - free (free_key); + scratch_buffer_free (&sbuf); + scratch_buffer_free (&salt_buf); return NULL; } NSSLOWHASHContext *nss_ctx = NULL; @@ -242,17 +254,13 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) sha512_finish_ctx (&alt_ctx, nss_alt_ctx, temp_result); /* Create byte sequence P. */ - if (__libc_use_alloca (alloca_used + key_len)) - cp = p_bytes = (char *) alloca (key_len); - else + if (!scratch_buffer_set_array_size (&p_bytes_buf, 1, key_len)) { - free_pbytes = cp = p_bytes = (char *)malloc (key_len); - if (free_pbytes == NULL) - { - free (free_key); - return NULL; - } + scratch_buffer_free (&sbuf); + scratch_buffer_free (&salt_buf); + return NULL; } + cp = p_bytes = p_bytes_buf.data; for (cnt = key_len; cnt >= 64; cnt -= 64) cp = mempcpy (cp, temp_result, 64); @@ -269,7 +277,14 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) sha512_finish_ctx (&alt_ctx, nss_alt_ctx, temp_result); /* Create byte sequence S. */ - cp = s_bytes = alloca (salt_len); + if (!scratch_buffer_set_array_size (&s_bytes_buf, 1, salt_len)) + { + scratch_buffer_free (&sbuf); + scratch_buffer_free (&salt_buf); + scratch_buffer_free (&p_bytes_buf); + } + cp = s_bytes = s_bytes_buf.data; + for (cnt = salt_len; cnt >= 64; cnt -= 64) cp = mempcpy (cp, temp_result, 64); memcpy (cp, temp_result, cnt); @@ -403,8 +418,10 @@ __sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) if (copied_salt != NULL) explicit_bzero (copied_salt, salt_len); - free (free_key); - free (free_pbytes); + scratch_buffer_free (&sbuf); + scratch_buffer_free (&salt_buf); + scratch_buffer_free (&p_bytes_buf); + scratch_buffer_free (&s_bytes_buf); return buffer; } -- 2.39.2