diff -Nru libdrm-2.4.82+git20170823.99d3f825/amdgpu/amdgpu_asic_id.c libdrm-2.4.83+git20170905.d55d0804/amdgpu/amdgpu_asic_id.c --- libdrm-2.4.82+git20170823.99d3f825/amdgpu/amdgpu_asic_id.c 2017-07-31 16:47:22.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/amdgpu/amdgpu_asic_id.c 2017-09-05 10:52:10.000000000 +0000 @@ -186,19 +186,20 @@ table_size++; } - /* end of table */ - id = asic_id_table + table_size; - memset(id, 0, sizeof(struct amdgpu_asic_id)); - if (table_size != table_max_size) { id = realloc(asic_id_table, (table_size + 1) * sizeof(struct amdgpu_asic_id)); - if (!id) + if (!id) { r = -ENOMEM; - else - asic_id_table = id; + goto free; + } + asic_id_table = id; } + /* end of table */ + id = asic_id_table + table_size; + memset(id, 0, sizeof(struct amdgpu_asic_id)); + free: free(line); diff -Nru libdrm-2.4.82+git20170823.99d3f825/ChangeLog libdrm-2.4.83+git20170905.d55d0804/ChangeLog --- libdrm-2.4.82+git20170823.99d3f825/ChangeLog 2017-08-23 07:55:13.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/ChangeLog 2017-09-05 10:52:35.000000000 +0000 @@ -1,9 +1,41 @@ -commit c56e3f9fb2cf7315882b0a5c8c6200b17dce92de +commit 7104123d5f33c105bcda74a4d76d970b890697db Author: Rico Tzschichholz -Date: Wed Aug 23 09:54:42 2017 +0200 +Date: Tue Sep 5 12:52:10 2017 +0200 Add debian tree from origin/debian-unstable +commit d55d0804f9e37637d7510f38f97e07a50c6b7baa +Author: Jan Vesely +Date: Fri Sep 1 14:49:19 2017 -0400 + + amdgpu: Do not write beyond allocated memory when parsing ids + + Fixes crash when/usr/share/libdrm/amdgpu.ids contains ASIC_ID_TABLE_NUM_ENTRIES + 1 entries. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102432 + Fixes: 7e6bf88cac315a9fa41818cf72a7b5d18a2cb1fc (amdgpu: move asic id table to a separate file) + Signed-off-by: Jan Vesely + Reviewed-by: Michel Dänzer + +commit 05a830d382382905d87b55af90aa109fb76e4c16 +Author: Alex Deucher +Date: Wed Aug 30 14:00:18 2017 -0400 + + tests/amdgpu: add missing header to SOURCES + + Fixes the tarball generation. + + fixes: 9d133dd08720d80dfc8ce098bf0972 (tests/amdgpu: add uvd encode unit tests) + bug: https://bugs.freedesktop.org/show_bug.cgi?id=102391 + Reviewed-by: Christian König + Signed-off-by: Alex Deucher + +commit f19dbb79fe54994ecd505ac67ad15d19f591933a +Author: Daniel Stone +Date: Thu Aug 24 12:31:30 2017 +0100 + + configure.ac: Bump version to 2.4.83 + commit 99d3f8253cff617af4662c48ba737bf6e10e146e Author: Philipp Zabel Date: Mon Aug 21 14:41:11 2017 +0200 diff -Nru libdrm-2.4.82+git20170823.99d3f825/configure libdrm-2.4.83+git20170905.d55d0804/configure --- libdrm-2.4.82+git20170823.99d3f825/configure 2017-08-23 07:55:09.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/configure 2017-09-05 10:52:30.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdrm 2.4.82. +# Generated by GNU Autoconf 2.69 for libdrm 2.4.83. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='libdrm' PACKAGE_TARNAME='libdrm' -PACKAGE_VERSION='2.4.82' -PACKAGE_STRING='libdrm 2.4.82' +PACKAGE_VERSION='2.4.83' +PACKAGE_STRING='libdrm 2.4.83' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=DRI' PACKAGE_URL='' @@ -1433,7 +1433,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdrm 2.4.82 to adapt to many kinds of systems. +\`configure' configures libdrm 2.4.83 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1504,7 +1504,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdrm 2.4.82:";; + short | recursive ) echo "Configuration of libdrm 2.4.83:";; esac cat <<\_ACEOF @@ -1676,7 +1676,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdrm configure 2.4.82 +libdrm configure 2.4.83 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2099,7 +2099,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdrm $as_me 2.4.82, which was +It was created by libdrm $as_me 2.4.83, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3458,7 +3458,7 @@ # Define the identity of the package. PACKAGE='libdrm' - VERSION='2.4.82' + VERSION='2.4.83' cat >>confdefs.h <<_ACEOF @@ -15281,7 +15281,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdrm $as_me 2.4.82, which was +This file was extended by libdrm $as_me 2.4.83, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15347,7 +15347,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdrm config.status 2.4.82 +libdrm config.status 2.4.83 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru libdrm-2.4.82+git20170823.99d3f825/configure.ac libdrm-2.4.83+git20170905.d55d0804/configure.ac --- libdrm-2.4.82+git20170823.99d3f825/configure.ac 2017-07-31 16:47:22.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/configure.ac 2017-09-05 10:52:10.000000000 +0000 @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.82], + [2.4.83], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) diff -Nru libdrm-2.4.82+git20170823.99d3f825/debian/changelog libdrm-2.4.83+git20170905.d55d0804/debian/changelog --- libdrm-2.4.82+git20170823.99d3f825/debian/changelog 2017-09-05 11:02:49.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/debian/changelog 2017-09-05 11:02:49.000000000 +0000 @@ -1,10 +1,10 @@ -libdrm (2.4.82+git20170823.99d3f825-0ubuntu0ricotz~16.04.1) xenial; urgency=medium +libdrm (2.4.83+git20170905.d55d0804-0ubuntu0ricotz~16.04.1) xenial; urgency=medium - * Checkout from git 20170823 (master branch) up to commit - 99d3f8253cff617af4662c48ba737bf6e10e146e + * Checkout from git 20170905 (master branch) up to commit + d55d0804f9e37637d7510f38f97e07a50c6b7baa * Only added debian/ tree from origin/debian-unstable - -- Rico Tzschichholz Wed, 23 Aug 2017 09:55:13 +0200 + -- Rico Tzschichholz Tue, 05 Sep 2017 12:52:35 +0200 libdrm (2.4.82-1) unstable; urgency=medium diff -Nru libdrm-2.4.82+git20170823.99d3f825/.lastcommit libdrm-2.4.83+git20170905.d55d0804/.lastcommit --- libdrm-2.4.82+git20170823.99d3f825/.lastcommit 2017-08-23 07:54:41.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/.lastcommit 2017-09-05 10:52:10.000000000 +0000 @@ -1 +1 @@ -commit 99d3f8253cff617af4662c48ba737bf6e10e146e +commit d55d0804f9e37637d7510f38f97e07a50c6b7baa diff -Nru libdrm-2.4.82+git20170823.99d3f825/tests/amdgpu/Makefile.am libdrm-2.4.83+git20170905.d55d0804/tests/amdgpu/Makefile.am --- libdrm-2.4.82+git20170823.99d3f825/tests/amdgpu/Makefile.am 2017-08-23 07:54:41.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/tests/amdgpu/Makefile.am 2017-09-05 10:52:10.000000000 +0000 @@ -28,4 +28,5 @@ vce_ib.h \ frame.h \ uvd_enc_tests.c \ - vcn_tests.c + vcn_tests.c \ + uve_ib.h diff -Nru libdrm-2.4.82+git20170823.99d3f825/tests/amdgpu/Makefile.in libdrm-2.4.83+git20170905.d55d0804/tests/amdgpu/Makefile.in --- libdrm-2.4.82+git20170823.99d3f825/tests/amdgpu/Makefile.in 2017-08-23 07:55:12.000000000 +0000 +++ libdrm-2.4.83+git20170905.d55d0804/tests/amdgpu/Makefile.in 2017-09-05 10:52:33.000000000 +0000 @@ -355,7 +355,8 @@ vce_ib.h \ frame.h \ uvd_enc_tests.c \ - vcn_tests.c + vcn_tests.c \ + uve_ib.h all: all-am