eth/downloader, les/downloader: fix subtle flaw in queue delivery (ethereum#25861)

zhiqiangxu · holiman · shekhirin · commit 029f4ede4483 · 2023-06-06T19:42:57.000+04:00
* fix queue.deliver

* les/downloader: fix queue.deliver

Co-authored-by: Martin Holst Swende &lt;martin@swende.se&gt;
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
@@ -857,7 +857,7 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header,
 	}
 
 	for _, header := range request.Headers[:i] {
-		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil {
+		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil && !stale {
 			reconstruct(accepted, res)
 		} else {
 			// else: between here and above, some other peer filled this result,
diff --git a/les/downloader/queue.go b/les/downloader/queue.go
@@ -870,7 +870,7 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header,
 	}
 
 	for _, header := range request.Headers[:i] {
-		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil {
+		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil && !stale {
 			reconstruct(accepted, res)
 		} else {
 			// else: between here and above, some other peer filled this result,

Original file line number	Diff line number	Diff line change
`@@ -857,7 +857,7 @@ func (q queue) deliver(id string, taskPool map[common.Hash]types.Header,`
`857`	`857`	`}`
`858`	`858`
`859`	`859`	`for _, header := range request.Headers[:i] {`
`860`		`- if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil {`
	`860`	`+ if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil && !stale {`
`861`	`861`	`reconstruct(accepted, res)`
`862`	`862`	`} else {`
`863`	`863`	`// else: between here and above, some other peer filled this result,`
Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ func (q queue) deliver(id string, taskPool map[common.Hash]types.Header,`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`for _, header := range request.Headers[:i] {`
`873`		`- if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil {`
	`873`	`+ if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil && !stale {`
`874`	`874`	`reconstruct(accepted, res)`
`875`	`875`	`} else {`
`876`	`876`	`// else: between here and above, some other peer filled this result,`