hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2026-06-11 05:37:26 -04:00
Code Issues Projects Releases Wiki Activity

apk: backport upstream fix for invalid fetch timestamps

Browse Source 
Uninitialized memory led to bogus, huge timestamps being set on files
downloaded with the wget backend. This caused odd issues like 'ls -l'
crashing busybox when attempting to list the .apk file afterwards.

Link: 42f159e67b
Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
Link: https://github.com/openwrt/openwrt/pull/21874
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Matt Merhar
2026-02-04 23:45:13 -05:00
committed by Robert Marko
parent 336ffdf631
commit f750e3096f
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/apk/Makefile
View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=apk
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git
PKG_SOURCE_PROTO:=git

2
package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch
View File

@@ -10,7 +10,7 @@ Signed-off-by: Paul Spooren <mail@aparcar.org>
--- a/src/database.c
+++ b/src/database.c
@@ -1918,7 +1918,7 @@ const char *apk_db_layer_name(int layer)
@@ -1919,7 +1919,7 @@ const char *apk_db_layer_name(int layer)
{
switch (layer) {
case APK_DB_LAYER_ROOT: return "lib/apk/db";

33
package/system/apk/patches/0020-io-fix-invalid-fetch-timestamps-with-wget-backend.patch Normal file
View File

@@ -0,0 +1,33 @@
From 42f159e67bafe1dad16839c0c0a005b5e89487ba Mon Sep 17 00:00:00 2001
From: Matt Merhar <mattmerhar@protonmail.com>
Date: Sun, 1 Feb 2026 21:16:01 -0500
Subject: [PATCH] io: fix invalid fetch timestamps with wget backend
In OpenWrt it was noticed that files downloaded via 'apk fetch' had
huge, invalid timestamps.
An strace showed utimensat_time64() being called with tv_sec values like
-5268223168728060756 and 1167423650789556, causing even an 'ls -l' of
the file afterwards to crash busybox.
The explanation here is that the process_get_meta() stub in process.c
doesn't set anything, so the struct is filled with garbage.
To address this, zero init the struct in apk_ostream_copy_meta(). This
leads to the timestamp of the downloaded file being set to the current
time.
---
src/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/io.c
+++ b/src/io.c
@@ -1258,7 +1258,7 @@ int apk_ostream_fmt(struct apk_ostream *
void apk_ostream_copy_meta(struct apk_ostream *os, struct apk_istream *is)
{
- struct apk_file_meta meta;
+ struct apk_file_meta meta = { 0 };
apk_istream_get_meta(is, &meta);
os->ops->set_meta(os, &meta);
}