Skip to content

Commit 3c385bf

Browse files
majst01majst01
authored
Update frr to fix a CVE (#265)
1 parent 8730aa3 commit 3c385bf

File tree

7 files changed

+50
-32
lines changed

7 files changed

+50
-32
lines changed

‎almalinux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ COPY --from=ignition-builder /work/ignition/bin/amd64/ignition* /usr/local/bin/
2323

2424
RUN set -ex \
2525
# with an empty /etc/machine-id nothing will be installed in /boot
26-
&& echo "almalinux" > /etc/machine-id \
26+
# machine-id must a valid, see man machine-id
27+
&& echo "7b9f54e12f3b4f06a34c9d0f4b0e68c2" > /etc/machine-id \
2728
&& dnf update -y \
2829
&& dnf install -y epel-release \
2930
&& dnf update -y \

‎cmd/install.go

+15
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,21 @@ func (i *installer) kernelAndInitrdPath() (kern string, initrd string, err error
583583
// -rwxr-xr-x 1 root root 43526368 Jul 19 2021 vmlinux-5.10.51
584584
// -rw-r--r-- 1 root root 6962816 Aug 13 15:25 vmlinuz-5.10.0-17-amd64
585585

586+
// Almalinux 9
587+
// [root@14231d4e67d28390 ~]# ls -l /boot/
588+
// total 160420
589+
// -rw------- 1 root root 8876661 Jan 7 23:19 System.map-5.14.0-503.19.1.el9_5.x86_64
590+
// -rw-r--r-- 1 root root 93842 Jul 19 2021 config-5.10.51
591+
// -rw-r--r-- 1 root root 226249 Jan 7 23:19 config-5.14.0-503.19.1.el9_5.x86_64
592+
// drwx------ 3 root root 4096 Jun 8 2022 efi
593+
// drwx------ 3 root root 4096 Jan 9 08:02 grub2
594+
// -rw------- 1 root root 97054329 Jan 9 08:04 initramfs-5.14.0-503.19.1.el9_5.x86_64.img
595+
// drwxr-xr-x 3 root root 4096 Jan 9 08:02 loader
596+
// lrwxrwxrwx 1 root root 52 Jan 9 08:03 symvers-5.14.0-503.19.1.el9_5.x86_64.gz -> /lib/modules/5.14.0-503.19.1.el9_5.x86_64/symvers.gz
597+
// lrwxrwxrwx 1 root root 21 Jul 19 2021 vmlinux -> /boot/vmlinux-5.10.51
598+
// -rwxr-xr-x 1 root root 43526368 Jul 19 2021 vmlinux-5.10.51
599+
// -rwxr-xr-x 1 root root 14467384 Jan 7 23:19 vmlinuz-5.14.0-503.19.1.el9_5.x86_64
600+
586601
var (
587602
bootPartition = "/boot"
588603
systemMapPrefix = "/boot/System.map-"

‎cmd/main.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ func main() {
2323

2424
oss, err := detectOS(fs)
2525
if err != nil {
26-
panic(err)
26+
log.Error("installation failed", "error", err)
27+
os.Exit(1)
2728
}
2829

2930
config, err := parseInstallYAML(fs)
3031
if err != nil {
31-
panic(err)
32+
log.Error("installation failed", "error", err)
33+
os.Exit(1)
3234
}
3335

3436
i := installer{
@@ -44,11 +46,11 @@ func main() {
4446

4547
err = i.do()
4648
if err != nil {
47-
i.log.Error("installation failed", "duration", time.Since(start))
48-
panic(err)
49+
i.log.Error("installation failed", "error", err, "duration", time.Since(start).String())
50+
os.Exit(1)
4951
}
5052

51-
i.log.Info("installation succeeded", "duration", time.Since(start))
53+
i.log.Info("installation succeeded", "duration", time.Since(start).String())
5254
}
5355

5456
func parseInstallYAML(fs afero.Fs) (*api.InstallerConfig, error) {

‎debian/docker-make.debian.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ builds:
2323
build-args:
2424
- BASE_OS_VERSION=bookworm
2525
- DOCKER_APT_CHANNEL=bookworm
26-
- FRR_VERSION=frr-10
27-
- FRR_VERSION_DETAIL=10.1.1-0~deb12u1
26+
- FRR_VERSION=frr-10.1
27+
- FRR_VERSION_DETAIL=10.1.2-0~deb12u1
2828
- FRR_APT_CHANNEL=bookworm
2929
- SEMVER_MAJOR_MINOR=12
3030
- SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}

‎debian/docker-make.ubuntu.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ builds:
2525
- ${SEMVER_MAJOR_MINOR}
2626
build-args:
2727
- BASE_OS_VERSION=24.04
28-
- FRR_VERSION=frr-10
29-
- FRR_VERSION_DETAIL=10.1.1-0~ubuntu24.04.1
28+
- FRR_VERSION=frr-10.1
29+
- FRR_VERSION_DETAIL=10.1.2-0~ubuntu24.04.1
3030
- FRR_APT_CHANNEL=noble
3131
- SEMVER_MAJOR_MINOR=24.04
3232
- SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}

‎go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ module github.com/metal-stack/metal-images
22

33
go 1.23.0
44

5-
toolchain go1.23.1
5+
toolchain go1.23.4
66

77
require (
88
github.com/aws/aws-sdk-go v1.55.5
99
github.com/flatcar/ignition v0.36.2
1010
github.com/google/go-cmp v0.6.0
11-
github.com/metal-stack/metal-go v0.39.1
12-
github.com/metal-stack/metal-hammer v0.13.8
11+
github.com/metal-stack/metal-go v0.39.4
12+
github.com/metal-stack/metal-hammer v0.13.10
1313
github.com/metal-stack/metal-lib v0.19.0
14-
github.com/metal-stack/metal-networker v0.45.2
14+
github.com/metal-stack/metal-networker v0.45.3
1515
github.com/metal-stack/v v1.0.3
1616
github.com/olekukonko/tablewriter v0.0.5
1717
github.com/spf13/afero v1.11.0
18-
github.com/stretchr/testify v1.9.0
18+
github.com/stretchr/testify v1.10.0
1919
gopkg.in/yaml.v3 v3.0.1
2020
)
2121

@@ -50,9 +50,9 @@ require (
5050
github.com/vincent-petithory/dataurl v1.0.0 // indirect
5151
go.mongodb.org/mongo-driver v1.17.1 // indirect
5252
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
53-
golang.org/x/sys v0.27.0 // indirect
54-
golang.org/x/text v0.19.0 // indirect
55-
google.golang.org/protobuf v1.35.1 // indirect
53+
golang.org/x/sys v0.29.0 // indirect
54+
golang.org/x/text v0.21.0 // indirect
55+
google.golang.org/protobuf v1.36.1 // indirect
5656
gopkg.in/inf.v0 v0.9.1 // indirect
5757
sigs.k8s.io/yaml v1.4.0 // indirect
5858
)

‎go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
128128
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
129129
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
130130
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
131-
github.com/metal-stack/metal-go v0.39.1 h1:oarRe7KbcvsOfjCLbXwlVVHJfX5AMlWxoCQrRpmbdrA=
132-
github.com/metal-stack/metal-go v0.39.1/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
133-
github.com/metal-stack/metal-hammer v0.13.8 h1:U3EVXbwDzQLn0IBgXFsA7rUZMhXoaaGOCRxxmODBm74=
134-
github.com/metal-stack/metal-hammer v0.13.8/go.mod h1:vvN5H8II1jlLXTOUmbJwsoOtYpwGa3+QEY8HEHzgbFw=
131+
github.com/metal-stack/metal-go v0.39.4 h1:UaYSsBc5JaGmVLI2uV8mOo5+T2v1pHUN+GwKXaNcmaE=
132+
github.com/metal-stack/metal-go v0.39.4/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
133+
github.com/metal-stack/metal-hammer v0.13.10 h1:p1L2rGeABbjv8jRnua7dYF8nDjLZ+BohkU1Bl6KxbBg=
134+
github.com/metal-stack/metal-hammer v0.13.10/go.mod h1:cOdArIOW1VBICPX3dlpyg1Wf3PsMeGjyw7mJJmCTqeU=
135135
github.com/metal-stack/metal-lib v0.19.0 h1:4yBnp/jPGgX9KeCje3A4MFL2oDjgjOjgsIK391LltRI=
136136
github.com/metal-stack/metal-lib v0.19.0/go.mod h1:fCMaWwVGA/xAoGvBk72/nfzqBkHly0iOzrWpc55Fau4=
137-
github.com/metal-stack/metal-networker v0.45.2 h1:f1U9tzLPG17fthnQROHphKDKpeW//VDnCiNbtNwcm+A=
138-
github.com/metal-stack/metal-networker v0.45.2/go.mod h1:DUjaql5THUSJd/7M1ZlcYgX/bllp1IhXwOFM+Nvkaus=
137+
github.com/metal-stack/metal-networker v0.45.3 h1:GALlPsSMYw70vuQLcmwEEX9VNJVWkZk/4pP7eERD/VU=
138+
github.com/metal-stack/metal-networker v0.45.3/go.mod h1:DUjaql5THUSJd/7M1ZlcYgX/bllp1IhXwOFM+Nvkaus=
139139
github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs=
140140
github.com/metal-stack/v v1.0.3/go.mod h1:YTahEu7/ishwpYKnp/VaW/7nf8+PInogkfGwLcGPdXg=
141141
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -168,8 +168,8 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
168168
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
169169
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
170170
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
171-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
172-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
171+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
172+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
173173
github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
174174
github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
175175
github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
@@ -262,8 +262,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
262262
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
263263
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
264264
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
265-
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
266-
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
265+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
266+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
267267
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
268268
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
269269
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -274,8 +274,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
274274
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
275275
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
276276
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
277-
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
278-
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
277+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
278+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
279279
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
280280
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
281281
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -340,8 +340,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
340340
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
341341
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
342342
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
343-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
344-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
343+
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
344+
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
345345
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
346346
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
347347
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

0 commit comments

Comments
 (0)