libdrm 2.4.49

This commit is contained in:
Dave Airlie 2013-11-24 16:41:58 +10:00
parent fbe8d21312
commit 5b852a44a2
4 changed files with 6 additions and 36 deletions

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ libdrm-20100612.tar.bz2
/libdrm-2.4.45.tar.bz2
/libdrm-2.4.46.tar.bz2
/libdrm-2.4.47.tar.bz2
/libdrm-2.4.49.tar.bz2

View File

@ -1,31 +0,0 @@
From 482abbfafb56cbceaf5355c026434e638cddd0f1 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu, 7 Nov 2013 13:30:19 +0100
Subject: [PATCH] nouveau: prevent undefined behavior in nouveau_pushbuf_reloc
with gcc-4.8
Reported-by: ronald645@gmail.com
Bisected-by (gcc): Andreas Radke <a.radke@arcor.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
---
nouveau/pushbuf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c
index 0fd0c47..4f77881 100644
--- a/nouveau/pushbuf.c
+++ b/nouveau/pushbuf.c
@@ -739,7 +739,8 @@ void
nouveau_pushbuf_reloc(struct nouveau_pushbuf *push, struct nouveau_bo *bo,
uint32_t data, uint32_t flags, uint32_t vor, uint32_t tor)
{
- *push->cur++ = pushbuf_krel(push, bo, data, flags, vor, tor);
+ *push->cur = pushbuf_krel(push, bo, data, flags, vor, tor);
+ push->cur++;
}
int
--
1.8.3.1

View File

@ -2,7 +2,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.47
Version: 2.4.49
Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
@ -36,8 +36,6 @@ Patch3: libdrm-make-dri-perms-okay.patch
Patch4: libdrm-2.4.0-no-bc.patch
# make rule to print the list of test programs
Patch5: libdrm-2.4.25-check-programs.patch
# fix issue with nouveau and gcc-4.8
Patch6: 0001-nouveau-prevent-undefined-behavior-in-nouveau_pushbu.patch
%description
Direct Rendering Manager runtime library
@ -64,7 +62,6 @@ Utility programs for the kernel DRM interface. Will void your warranty.
%patch3 -p1 -b .forceperms
%patch4 -p1 -b .no-bc
%patch5 -p1 -b .check
%patch6 -p1 -b .nouveau
%build
autoreconf -v --install || exit 1
@ -206,6 +203,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
* Sun Nov 24 2013 Dave Airlie <airlied@redhat.com> 2.4.49-1
- libdrm 2.4.49
* Fri Nov 08 2013 Dave Airlie <airlied@redhat.com> 2.4.47-1
- libdrm 2.4.47

View File

@ -1 +1 @@
e043d6d59328887b9e434f4d27aacc09 libdrm-2.4.47.tar.bz2
454fe27645152cbd8be8ccda21acaa24 libdrm-2.4.49.tar.bz2