From 82182a6489b30b7581e919ffa940d1f6ec1e36f6 Mon Sep 17 00:00:00 2001
From: Peter Rabbitson <ribasushi@leporine.io>
Date: Sun, 4 Aug 2024 12:23:29 +0200
Subject: [PATCH] Fix grave bug under concurrent use of PieceAggregateCommP

Original code naively used a global hasher without any concurrency control
---
 commd.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/commd.go b/commd.go
index 3961477..51ff15b 100644
--- a/commd.go
+++ b/commd.go
@@ -3,7 +3,9 @@ package commp
 import (
 	"errors"
 	"fmt"
+	"hash"
 	"math/bits"
+	"sync"
 
 	"github.com/filecoin-project/go-commp-utils/zerocomm"
 	commcid "github.com/filecoin-project/go-fil-commcid"
@@ -110,11 +112,14 @@ func PieceAggregateCommP(proofType abi.RegisteredSealProof, pieceInfos []abi.Pie
 	return commcid.PieceCommitmentV1ToCID(stack[0].commP)
 }
 
-var s256 = sha256simd.New()
+var s256pool = sync.Pool{New: func() any { return sha256simd.New() }}
 
 func zeroCommForSize(s uint64) []byte { return zerocomm.PieceComms[bits.TrailingZeros64(s)-7][:] }
 
 func reduceStack(s []stackFrame) []stackFrame {
+
+	s256 := s256pool.Get().(hash.Hash)
+
 	for len(s) > 1 && s[len(s)-2].size == s[len(s)-1].size {
 
 		s256.Reset()
@@ -131,5 +136,7 @@ func reduceStack(s []stackFrame) []stackFrame {
 		s = s[:len(s)-1]
 	}
 
+	s256pool.Put(s256)
+
 	return s
 }