Povilas Kanapickas
e876379f31
genesys: Simplify session in simple_move() on gl646
2020-05-06 01:05:41 +03:00
Povilas Kanapickas
5a2e81b633
genesys: Simplify session setup in led_calibration on gl646
2020-05-06 01:05:40 +03:00
Povilas Kanapickas
09eb07561f
genesys: Split simple_scan() into version that accepts ScanSession
2020-05-06 01:05:39 +03:00
Povilas Kanapickas
4f1dad8ca9
genesys: Simplify session setup on gl646
2020-05-06 01:05:38 +03:00
Povilas Kanapickas
99a59d9871
genesys: Remove out of date comment
2020-05-06 01:05:37 +03:00
Ordissimo
7f1741d54d
Merge branch 'escl-fix-vendor' into 'master'
...
Put the vendor corresponding to the device used.
See merge request sane-project/backends!426
2020-05-05 20:48:02 +00:00
Thierry HUCHARD
8e2d335653
Put the vendor corresponding to the device used.
2020-05-05 22:29:03 +02:00
Olaf Meeuwissen
e18242108e
v4l: Drop kernel interface from v4l.h
...
It has been included in libv4l1.h since 0.8.3.
2020-05-05 16:15:13 +09:00
Olaf Meeuwissen
95b4369166
v4l: Prefer C99 standard type over asm __u32. Re #291
2020-05-05 16:14:11 +09:00
Olaf Meeuwissen
9e1acea497
umax_pp: Fix typo. Fixes #290
2020-05-05 13:08:23 +09:00
Olaf Meeuwissen
1a201b28ab
ricoh2: Use C99 standard headers
...
Inspired by a FreeBSD patch. Fixes #289 .
2020-05-05 12:55:19 +09:00
Olaf Meeuwissen
9232792e0f
epsonds: Add missing header files for socket use. Fixes #286
2020-05-05 12:31:34 +09:00
Ordissimo
bd482b6365
Merge branch 'escl-fixe-descriptor-size' into 'master'
...
Fixe descriptor size.
See merge request sane-project/backends!424
2020-05-04 11:39:19 +00:00
thierry1970
2ed753b3fe
Fixe descriptor size.
2020-05-04 13:19:03 +02:00
Olaf Meeuwissen
2b4aa45bad
Merge branch 'issue11-read_of_uninitialized_data' into '279-confidential-issue'
...
magicolor: Added security mediation to device discovery
See merge request paddy-hack/backends!2
2020-05-04 08:24:19 +00:00
Olaf Meeuwissen
37b142494b
Merge branch 'issue10-SIGFPE-in-mc_setup_block_mode' into '279-confidential-issue'
...
magicolor: Added security remediation for pixels_per_line.
See merge request paddy-hack/backends!1
2020-05-04 05:28:37 +00:00
Olaf Meeuwissen
8682023faa
sanei_tcp: Address possible integer overflow. Re #279 , issue 8
2020-05-04 11:54:35 +09:00
Olaf Meeuwissen
fe08bbee6b
epsonds: Handle error condition. Re #279 , issue 8
2020-05-04 11:48:46 +09:00
Ordissimo
0f657faf7c
Merge branch 'escl-cancel-scan' into 'master'
...
Fix the status of the scanner in case of failure.
See merge request sane-project/backends!422
2020-05-02 09:23:17 +00:00
Thierry HUCHARD
855cc408d3
Fix the status of the scanner in case of failure.
2020-05-02 11:05:49 +02:00
Olaf Meeuwissen
a8ce7a99ce
Merge branch 'ci-fedora-32' into 'master'
...
CI: Bump Fedora from 31 to 32
See merge request sane-project/backends!421
2020-05-02 05:29:17 +00:00
Olaf Meeuwissen
a0ef09c456
CI: Bump Fedora from 31 to 32
2020-05-02 14:12:33 +09:00
Ordissimo
bc6e04f477
Merge branch 'escl-correction-label-source' into 'master'
...
escl : Fixed source argument.
See merge request sane-project/backends!420
2020-05-01 10:37:17 +00:00
Thierry HUCHARD
2190739b31
Fixed source argument.
2020-05-01 11:59:58 +02:00
Ralph Little
07e3834127
magicolor: Added security mediation to device discovery
...
Extraction of values from the SNMP response were not checked.
Also fixed a bug that mistakenly matched any SNMP OIDs with the
first model in the model list, in function mc_get_device_from_identification().
2020-04-30 23:21:00 -07:00
Ordissimo
ea053c1a64
Merge branch 'capabilities-logs' into 'master'
...
Don't use the uninitialized data during getting capabilities and print capabilities
See merge request sane-project/backends!419
2020-05-01 05:04:33 +00:00
Bartosz Kosiorek
24ffce93fd
Don't use the uninitialized data during getting capabilities and print capabilities
2020-04-30 22:36:00 +02:00
Olaf Meeuwissen
fff83e7eac
epson2: Rewrite network I/O
...
This addresses GHSL-2020-075 as well as all other problematic code
uncovered as a result of investigating that. This includes:
- buffer overflows due to use of unchecked lengths
- integer overflows due to type conversions
- potential memory leaks
- checking for memory allocation failures
Re #279 .
2020-04-30 21:21:30 +09:00
Olaf Meeuwissen
27ea994d23
epsonds: Do not read beyond the end of the token
...
Addresses GHSL-2020-082, re #279 .
2020-04-30 21:15:45 +09:00
Olaf Meeuwissen
9aad355032
Merge branch 'update-epkowa-documentation' into 'master'
...
Sync doc/descriptions-external/epkowa.desc with latest upstream
See merge request sane-project/backends!408
2020-04-30 01:34:12 +00:00
Bartosz Kosiorek
dabd927009
Sync doc/descriptions-external/epkowa.desc with latest upstream
...
iscan-data_1.39.1-2.tar.gz archive downloaded from:
http://support.epson.net/linux/src/scanner/iscan/
2020-04-29 22:09:56 +02:00
Olaf Meeuwissen
b9b0173409
epsonds: Prevent possible buffer overflow when reading image data
...
Addresses GHSL-2020-084, re #279 .
2020-04-27 20:24:44 +09:00
Olaf Meeuwissen
db9480b09e
epsonds: Read only up to seven hexdigits to determine payload size
...
Addresses GHSL-2020-083, re #279 .
2020-04-27 20:24:11 +09:00
Ralph Little
af0442f15c
magicolor: Added security remediation for pixels_per_line.
...
This implements a security issue reported by GitHub Security Lab.
The details are disclosed in GitLab issue #279 .
The issue relates to an invalid scan parameter block being sent to
the backend containing 8 bytes of 0x00 which leads to pixels_per_line
being set to 0. Later arithmetic involves the division by this value
which causes a div by zero crash.
2020-04-26 13:04:41 -07:00
Povilas Kanapickas
812497969c
Merge branch 'genesys-plustek-7200' into 'master'
...
genesys: Add support for Plustek OpticFilm 7200
See merge request sane-project/backends!418
2020-04-23 18:53:20 +00:00
Povilas Kanapickas
08b41c052e
genesys: Add support for Plustek OpticFilm 7200
2020-04-23 21:36:23 +03:00
Oliver Schwartz
867aeb7d09
Merge branch 'master' into 'master'
...
sanei_usb: allow non-configured devices on macOS for libusb-1.x
See merge request sane-project/backends!358
2020-04-23 14:13:27 +00:00
Povilas Kanapickas
a70beba79c
Merge branch 'genesys-cleanup-motor-dpi' into 'master'
...
genesys: Merge motor optical_ydpi to base_ydpi
See merge request sane-project/backends!417
2020-04-22 20:09:23 +00:00
Povilas Kanapickas
e5c371b24b
genesys: Merge motor optical_ydpi to base_ydpi
2020-04-22 22:41:45 +03:00
Alex Belkin
40a451b1ac
xerox_mfp: Mark Xerox WorkCentre 3225 as supported
...
Reported by Darodaros in issue sane-project/website#26 .
2020-04-22 16:15:33 +03:00
Zdenek Dohnal
ea8beca57d
Fix assertion error in gl841 asic type by lowering steps for fast/back/slow tables
2020-04-22 13:23:41 +02:00
Ordissimo
5cf347d34d
Merge branch 'escl-ADF-only-scans-first-page' into 'master'
...
Moves to the next page.
See merge request sane-project/backends!416
2020-04-21 13:06:27 +00:00
thierry1970
32083172ea
Allows you to move to the next page.
2020-04-21 14:49:40 +02:00
Ordissimo
27e3d21351
Merge branch 'escl-invalide-image-with-scanimage' into 'master'
...
eSCL : Fix invalide image with scanimage.
See merge request sane-project/backends!415
2020-04-21 11:05:21 +00:00
thierry1970
111d8d2aab
Fix invalide image with scanimage.
2020-04-21 12:47:07 +02:00
Povilas Kanapickas
5eec2b4a0c
Merge branch 'genesys-cleanup-gl841' into 'master'
...
genesys: Cleanup gl841 code
See merge request sane-project/backends!414
2020-04-19 23:35:56 +00:00
Povilas Kanapickas
53162b4cad
genesys: Remove no longer used motor action
2020-04-20 00:35:57 +03:00
Povilas Kanapickas
af28c2d56c
genesys: Reuse scanner_move_back_home() on gl841
2020-04-20 00:35:56 +03:00
Povilas Kanapickas
d9b49e567c
genesys: Simplify motor direction setup on gl841
2020-04-20 00:35:55 +03:00
Povilas Kanapickas
8412861a66
genesys: Support reverse scan direction on gl841
2020-04-20 00:35:54 +03:00