Compare commits
No commits in common. "fa993e3d6ee52195d261cfe8e243fb3b28fa92b8" and "c8" have entirely different histories.
fa993e3d6e
...
c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/xf86-input-wacom-*.tar.bz2
|
||||
SOURCES/xf86-input-wacom-0.38.0.tar.bz2
|
||||
|
@ -1 +1 @@
|
||||
edc1b688681dcead4d4e0d9d4ed1817f5861fbcf xf86-input-wacom-1.0.0.tar.bz2
|
||||
b153c976365a54af3d5265e50e7a1e6eb415851d SOURCES/xf86-input-wacom-0.38.0.tar.bz2
|
||||
|
@ -0,0 +1,40 @@
|
||||
From 2a7af30793f9aa6e36acdc7c8b908d0965585437 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Gerecke <killertofu@gmail.com>
|
||||
Date: Thu, 10 Oct 2019 12:13:39 -0700
|
||||
Subject: [PATCH] tools: Fix potential buffer overflow when reading from serial
|
||||
tablet
|
||||
|
||||
The read_data() function has a "min_len" number of bytes to read
|
||||
to ensure that a complete data structure is read, regardless of garbage
|
||||
that may be on the line. When garbage is present, however, it can
|
||||
potentially overflow the buffer.
|
||||
|
||||
The function already has code to memmove the good data over garbage and
|
||||
perform re-reads until "min_len" bytes of good data are available. All
|
||||
we need to do to avoid the buffer overflow is ensure that the maximum
|
||||
number of bytes we read() in one call is no more than the number of
|
||||
bytes free at the end of the buffer.
|
||||
|
||||
Ref: https://github.com/linuxwacom/xf86-input-wacom/issues/86
|
||||
Fixes: 3546d8ab1b ("tools: add isdv4-serial-debugger test program")
|
||||
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||||
---
|
||||
tools/tools-shared.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/tools-shared.c b/tools/tools-shared.c
|
||||
index c55e8ca1..c10d8e86 100644
|
||||
--- a/tools/tools-shared.c
|
||||
+++ b/tools/tools-shared.c
|
||||
@@ -219,7 +219,7 @@ int read_data(int fd, unsigned char* buffer, int min_len)
|
||||
TRACE("Reading %d bytes from device.\n", min_len);
|
||||
redo:
|
||||
do {
|
||||
- int l = read(fd, &buffer[len], min_len);
|
||||
+ int l = read(fd, &buffer[len], min_len - len);
|
||||
|
||||
if (l == -1) {
|
||||
if (errno != EAGAIN) {
|
||||
--
|
||||
2.23.0
|
||||
|
@ -8,10 +8,11 @@
|
||||
|
||||
Summary: Xorg X11 wacom input driver
|
||||
Name: xorg-x11-drv-wacom
|
||||
Version: 1.0.0
|
||||
Version: 0.38.0
|
||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
URL: http://www.x.org
|
||||
License: GPLv2+
|
||||
Group: User Interface/X Hardware Support
|
||||
|
||||
%if 0%{?gitdate}
|
||||
Source0: %{tarball}-%{gitdate}.tar.bz2
|
||||
@ -21,7 +22,8 @@ Source2: commitid
|
||||
Source0: https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-%{version}/xf86-input-wacom-%{version}.tar.bz2
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
Patch01: 0001-tools-Fix-potential-buffer-overflow-when-reading-fro.patch
|
||||
|
||||
BuildRequires: xorg-x11-server-devel >= 1.10.99.902
|
||||
BuildRequires: xorg-x11-util-macros >= 1.3.0
|
||||
BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel
|
||||
@ -40,6 +42,7 @@ X.Org X11 wacom input driver for Wacom tablets.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
autoreconf --force -v --install || exit 1
|
||||
@ -71,6 +74,7 @@ mv $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/wacom.rules $RPM_BUILD_ROOT/%{_pr
|
||||
|
||||
%package devel
|
||||
Summary: Xorg X11 wacom input driver development package
|
||||
Group: Development/Libraries
|
||||
|
||||
Requires: xorg-x11-server-devel >= 1.7.0
|
||||
Requires: pkgconfig
|
||||
@ -89,6 +93,7 @@ X.Org X11 wacom input driver development files.
|
||||
|
||||
%package serial-support
|
||||
Summary: Files for enabling the wacom_w8001 kernel driver
|
||||
Group: User Interface/X Hardware Support
|
||||
|
||||
%description serial-support
|
||||
Files for enabling the wacom_w8001 kernel driver on Wacom
|
||||
@ -102,56 +107,16 @@ will be available as normal evdev node.
|
||||
%{_unitdir}/wacom-inputattach@.service
|
||||
|
||||
%changelog
|
||||
* Wed Feb 16 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.0-1
|
||||
- xf86-input-wacom 1.0.0 (#2051828)
|
||||
* Mon Nov 04 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.38.0-1
|
||||
- wacom 0.38.0 (#1728822)
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.40.0-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.40.0-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Thu Feb 04 2021 Peter Hutterer <peter.hutterer@redhat.com> 0.40.0-1
|
||||
- xf86-input-wacom 0.40.0
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.39.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Nov 5 10:26:34 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 0.39.0-4
|
||||
- Add BuildRequires for make
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.39.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.39.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Dec 23 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.39.0-1
|
||||
- xf86-input-wacom 0.39.0
|
||||
|
||||
* Fri Oct 18 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.38.0-1
|
||||
- xf86-input-wacom 0.38.0
|
||||
|
||||
* Wed Oct 16 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.37.99.1-2
|
||||
- xf86-input-wacom 0.37.99.1
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.37.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jun 20 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.37.0-1
|
||||
- xf86-input-wacom 0.37.0
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.36.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.36.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
* Fri Dec 14 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.36.1-5
|
||||
- Warn when running xsetwacom on Wayland (#1657568)
|
||||
|
||||
* Wed Jul 11 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.36.1-4
|
||||
- Build on s390x (#1565062)
|
||||
|
||||
* Mon Apr 02 2018 Adam Jackson <ajax@redhat.com> - 0.36.1-3
|
||||
* Mon May 14 2018 Adam Jackson <ajax@redhat.com> - 0.36.1-2.1
|
||||
- Rebuild for xserver 1.20
|
||||
|
||||
* Tue Mar 20 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.36.1-2
|
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
@ -1,18 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
DIRNAME=xf86-input-wacom-$( date +%Y%m%d )
|
||||
|
||||
rm -rf $DIRNAME
|
||||
#git clone git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/xf86-input-wacom $DIRNAME
|
||||
git clone https://github.com/linuxwacom/xf86-input-wacom.git $DIRNAME
|
||||
cd $DIRNAME
|
||||
if [ -z "$1" ]; then
|
||||
git log | head -1
|
||||
else
|
||||
git checkout $1
|
||||
fi
|
||||
git log | head -1 | awk '{ print $2 }' > ../commitid
|
||||
git repack -a -d
|
||||
cd ..
|
||||
tar jcf $DIRNAME.tar.bz2 $DIRNAME
|
||||
rm -rf $DIRNAME
|
Loading…
Reference in New Issue
Block a user