treewide: fix %v in cases where we should use %w
We should always use %w when using fmt.Errorf as you can use error.Is to
compare the underlying error. When printing an error the use of %w is
wrong and should be replaced with %v.
Change-Id: I741111bd91dcee4099144d2ecaffa879fdbb34a2
Reviewed-on: https://review.monogon.dev/c/monogon/+/2993
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/osbase/tpm/eventlog/eventlog.go b/osbase/tpm/eventlog/eventlog.go
index dbfeae0..03aaf69 100644
--- a/osbase/tpm/eventlog/eventlog.go
+++ b/osbase/tpm/eventlog/eventlog.go
@@ -259,7 +259,7 @@
}
el := e.clone()
if err := wkrd.apply(el); err != nil {
- return nil, fmt.Errorf("failed applying workaround %q: %v", wkrd.id, err)
+ return nil, fmt.Errorf("failed applying workaround %q: %w", wkrd.id, err)
}
if events, err := replayEvents(el.rawEvents, pcrs); err == nil {
return events, nil
@@ -394,12 +394,12 @@
var el EventLog
e, err := parseFn(r, specID)
if err != nil {
- return nil, fmt.Errorf("parse first event: %v", err)
+ return nil, fmt.Errorf("parse first event: %w", err)
}
if e.typ == eventTypeNoAction {
specID, err = parseSpecIDEvent(e.data)
if err != nil {
- return nil, fmt.Errorf("failed to parse spec ID event: %v", err)
+ return nil, fmt.Errorf("failed to parse spec ID event: %w", err)
}
for _, alg := range specID.algs {
switch tpm2.Algorithm(alg.ID) {
@@ -472,7 +472,7 @@
NumAlgs uint32
}
if err := binary.Read(r, binary.LittleEndian, &header); err != nil {
- return nil, fmt.Errorf("reading event header: %v", err)
+ return nil, fmt.Errorf("reading event header: %w", err)
}
if header.Signature != wantSignature {
return nil, fmt.Errorf("invalid spec id signature: %x", header.Signature)
@@ -493,14 +493,14 @@
var e specIDEvent
for i := 0; i < int(header.NumAlgs); i++ {
if err := binary.Read(r, binary.LittleEndian, &specAlg); err != nil {
- return nil, fmt.Errorf("reading algorithm: %v", err)
+ return nil, fmt.Errorf("reading algorithm: %w", err)
}
e.algs = append(e.algs, specAlg)
}
var vendorInfoSize uint8
if err := binary.Read(r, binary.LittleEndian, &vendorInfoSize); err != nil {
- return nil, fmt.Errorf("reading vender info size: %v", err)
+ return nil, fmt.Errorf("reading vender info size: %w", err)
}
if r.Len() != int(vendorInfoSize) {
return nil, fmt.Errorf("reading vendor info, expected %d remaining bytes, got %d", vendorInfoSize, r.Len())
@@ -600,7 +600,7 @@
continue
}
if uint16(r.Len()) < alg.Size {
- return event, fmt.Errorf("reading digest: %v", io.ErrUnexpectedEOF)
+ return event, fmt.Errorf("reading digest: %w", io.ErrUnexpectedEOF)
}
digest.data = make([]byte, alg.Size)
digest.hash = HashAlg(alg.ID).cryptoHash()