Olaf Meeuwissen
833c25c3ae
Merge branch 'inspiration-from-freebsd-patches' into 'master'
...
Inspiration from freebsd patches
Closes #291 , #290 , #289 , and #286
See merge request sane-project/backends!425
2020-05-06 05:58:02 +00:00
Olaf Meeuwissen
3d005c2570
Merge branch 'issue05-out-of-bounds-read-decode_binary' into '279-confidential-issue'
...
epsonds: Do not read beyond the end of the token
See merge request paddy-hack/backends!5
2020-05-06 04:06:49 +00:00
Olaf Meeuwissen
226d9c9289
Merge branch 'issue07-out-of-bounds-read-in-esci2_check_header' into '279-confidential-issue'
...
epsonds: Read only up to seven hexdigits to determine payload size
See merge request paddy-hack/backends!6
2020-05-06 04:05:59 +00:00
Olaf Meeuwissen
02b5d33b7a
Merge branch 'issue08-integer-overflow-sanei_tcp_read' into '279-confidential-issue'
...
sanei: Integer overflow sanei tcp read
See merge request paddy-hack/backends!7
2020-05-06 04:04:18 +00:00
Olaf Meeuwissen
4c9e4efd4a
Merge branch 'issue01-null-pointer-deref-sanei_epson_net_read' into '279-confidential-issue'
...
epson2: Rewrite network I/O
See merge request paddy-hack/backends!3
2020-05-06 04:03:19 +00:00
Ordissimo
b5013094f8
Merge branch 'add-vendor' into 'master'
...
Escl - Add vendor
See merge request sane-project/backends!428
2020-05-05 22:31:58 +00:00
Povilas Kanapickas
06ad1dd43f
genesys: Inline setup_for_scan() into gl646_repark_head()
2020-05-06 01:29:10 +03:00
Povilas Kanapickas
1b5c31bb01
genesys: Inline setup_for_scan() into init_regs_for_warmup() on gl646
2020-05-06 01:29:09 +03:00
Povilas Kanapickas
d7bf809a6c
genesys: Inline setup_for_scan() into init_regs_for_shading() on gl646
2020-05-06 01:29:08 +03:00
Povilas Kanapickas
7ba20e43a3
genesys: Simplify simple_scan() on gl646
2020-05-06 01:29:07 +03:00
Povilas Kanapickas
f1d6c2c0cd
genesys: Inline setup_for_scan into simple_scan on gl646
2020-05-06 01:29:06 +03:00
Thierry HUCHARD
0efee9ddd6
Fix model name cropping.
2020-05-06 00:14:12 +02:00
Thierry HUCHARD
cd18ba69de
Add vendor
2020-05-06 00:13:37 +02:00
Povilas Kanapickas
644f4b0c94
genesys: Simplify session setup in ad_fe_offset_calibration() on gl646
2020-05-06 01:05:45 +03:00
Povilas Kanapickas
4183f37b46
genesys: Simplify session setup in offset_calibration() on gl646
2020-05-06 01:05:44 +03:00
Povilas Kanapickas
e32ca11346
genesys: simplify session setup in ad_fe_coarse_gain_calibration()
2020-05-06 01:05:43 +03:00
Povilas Kanapickas
1f78a2e64c
genesys: Simplify session setup in coarse_gain_calibration() on gl646
2020-05-06 01:05:42 +03:00
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