diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-12-08 19:01:08 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-12-08 19:01:08 +0100 |
| commit | ef47758a26f86d83ec385431f06e192146ca8b80 (patch) | |
| tree | 608d0bbb546ab14882dc44f2092676ee58c2a457 | |
| parent | fa53d0396fd70949dbcdedf7b7446da08a14443c (diff) | |
New debian/patches/0185-fix_memory.patch
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/0185-fix_memory.patch | 50 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 54 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 7fc073a..5b80a57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ sane-backends (1.3.1-1) UNRELEASED; urgency=medium * debian/libsane1.symbols: - Replace hurd-i386 with hurd-any to fix FTBFS (Closes: #1081122). - Remove kfreebsd. + * New debian/patches/0185-fix_memory.patch: + - Fix memory handling at backends/hp5590_low.c + (Closes: #1071658, #1071660). -- Jörg Frings-Fürst <debian@jff.email> Sun, 08 Dec 2024 17:07:00 +0100 diff --git a/debian/patches/0185-fix_memory.patch b/debian/patches/0185-fix_memory.patch new file mode 100644 index 0000000..fc36e4f --- /dev/null +++ b/debian/patches/0185-fix_memory.patch @@ -0,0 +1,50 @@ +diff --git a/backend/hp5590.c b/backend/hp5590.c +index 78c93132558365c8005c45fb756da57d1dfe9005..56acfb13c308f889daba472e05f1a03bb5967d18 100644 +--- a/backend/hp5590.c ++++ b/backend/hp5590.c +@@ -2154,6 +2154,24 @@ sane_read_internal (struct hp5590_scanner * scanner, SANE_Byte * data, + max_length, + scanner->transferred_image_size); + ++ /* ++ * We will truncate down the buffer size to *under* what the ++ * internal USB reading buffer can supply. This will avoid page read issues ++ * at the end of the buffer. ++ * ++ * See: https://gitlab.com/sane-project/backends/-/issues/781 ++ * ++ */ ++ if (max_length > BULK_READ_PAGE_SIZE * MAX_READ_PAGES) ++ { ++ DBG (DBG_proc, "%s, truncating sane_read buffer from %u to %u\n", ++ __func__, ++ max_length, ++ BULK_READ_PAGE_SIZE * MAX_READ_PAGES); ++ ++ max_length = BULK_READ_PAGE_SIZE * MAX_READ_PAGES; ++ } ++ + SANE_Int length_limited = 0; + *length = max_length; + if ((unsigned long long) *length > scanner->transferred_image_size) +diff --git a/backend/hp5590_low.c b/backend/hp5590_low.c +index 2d19dcf951717919099995a402002e1d18822849..7038f438640c72ede3b9d01d09d14b750f2c0041 100644 +--- a/backend/hp5590_low.c ++++ b/backend/hp5590_low.c +@@ -99,9 +99,15 @@ struct usb_in_usb_ctrl_setup { + #define CORE_FLAG_NOT_READY 1 << 1 + + /* Bulk transfers are done in pages, below their respective sizes */ ++/* ++ * Note that we limit the amount we can supply to sane_read() to avoid ++ * clashes with the size of the internal read buffer. ++ * ++ */ + #define BULK_WRITE_PAGE_SIZE 0x0f000 + #define BULK_READ_PAGE_SIZE 0x10000 +-#define ALLOCATE_BULK_READ_PAGES 16 /* 16 * 65536 = 1Mb */ ++#define ALLOCATE_BULK_READ_PAGES 17 /* 16 * 65536 = 1Mb */ ++#define MAX_READ_PAGES 16 /* maximum that we will return to sane_read() */ + + /* Structure describing bulk read state, because bulk reads will be done in + * pages, but function caller uses its own buffer, whose size is certainly diff --git a/debian/patches/series b/debian/patches/series index 93fa125..5b54a3b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 0200-disable-check-equal-stderr.patch 0610-fix_groff_font_warnings.patch 0180-Escl_force_idle_status.patch +0185-fix_memory.patch |