Merge ~utkarsh/ubuntu/+source/virglrenderer:merge-lp1959175-jammy into ubuntu/+source/virglrenderer:debian/experimental

[Utkarsh Gupta]

Hello,

This is a very trivial merge of virglrenderer. The delta is already upstream and Debian will pick it up as soon as they do a new upstream release.

PPA could be found at: https://launchpad.net/~utkarsh/+archive/ubuntu/temporary-stuff.

Let me know what you think! :D

[Andreas Hasenack (ahasenack)]

symbols file just had additions
no soname change
simple delta, kept

I can't tell if this version bump will require qemu changes, I assume not because the bug asking for it was filed by Christian and he didn't mention any.

+1

review: Approve

[Utkarsh Gupta (utkarsh)]

Thank you, Andreas! \o/

$ dput ubuntu ../virglrenderer_0.9.1-1\~exp1ubuntu1_source.changes
Checking signature on .changes
gpg: ../virglrenderer_0.9.1-1~exp1ubuntu1_source.changes: Valid signature from 823E967606C34B96
Checking signature on .dsc
gpg: ../virglrenderer_0.9.1-1~exp1ubuntu1.dsc: Valid signature from 823E967606C34B96
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading virglrenderer_0.9.1-1~exp1ubuntu1.dsc: done.
  Uploading virglrenderer_0.9.1.orig.tar.bz2: done.
  Uploading virglrenderer_0.9.1-1~exp1ubuntu1.debian.tar.xz: done.
  Uploading virglrenderer_0.9.1-1~exp1ubuntu1_source.buildinfo: done.
  Uploading virglrenderer_0.9.1-1~exp1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated, could you please set this MP to "merged"?

diff --git a/debian/changelog b/debian/changelog
index 095e7bb..75ecc99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virglrenderer (0.9.1-1~exp1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1959175). Remaining changes:
+    - d/p/lp-1950941*: fix out of bounds check (LP #1950941)
+
+ -- Utkarsh Gupta <[e-mail]>  Fri, 25 Feb 2022 02:23:43 +0530
+
 virglrenderer (0.9.1-1~exp1) experimental; urgency=medium
 
   * New upstream version 0.9.1
@@ -11,6 +18,18 @@ virglrenderer (0.9.0-1~exp1) experimental; urgency=medium
 
  -- Gert Wollny <[e-mail]>  Tue, 06 Apr 2021 15:24:55 +0200
 
+virglrenderer (0.8.2-5ubuntu1) jammy; urgency=medium
+
+  * d/p/lp-1950941*: fix out of bounds check (LP: #1950941)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 02 Dec 2021 08:34:48 +0100
+
+virglrenderer (0.8.2-5build1) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:26:08 +0200
+
 virglrenderer (0.8.2-5) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
diff --git a/debian/control b/debian/control
index a256720..685f907 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: virglrenderer
 Section: libs
 Priority: optional
-Maintainer: Gert Wollny <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Gert Wollny <[e-mail]>
 Build-Depends: check,
                debhelper-compat (= 12),
                libdrm-dev,
diff --git a/debian/patches/lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch b/debian/patches/lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch
 new file mode 100644
index 0000000..02a6559
--- /dev/null
+++ b/debian/patches/lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch
@@ -0,0 +1,34 @@
+From 673f4d0c1dfe78f66e8d7f036c619065800022de Mon Sep 17 00:00:00 2001
+From: Chia-I Wu <[e-mail]>
+Date: Wed, 21 Jul 2021 13:08:12 -0700
+Subject: [PATCH] vrend: fix boundary check for SSBO state update
+
+(PIPE_MAX_SHADER_BUFFERS - num_ssbo) can underflow.
+
+Signed-off-by: Chia-I Wu <[e-mail]>
+Reviewed-by: Yiwei Zhang <[e-mail]>
+
+Origin: upstream, https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/673f4d0c1dfe78f66e8d7f036c619065800022de
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1950941
+Last-Update: 2021-12-02
+
+---
+ src/vrend_decode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vrend_decode.c b/src/vrend_decode.c
+index 35ccc23..9fc3552 100644
+--- a/src/vrend_decode.c
++++ b/src/vrend_decode.c
+@@ -1208,7 +1208,7 @@ static int vrend_decode_set_shader_buffers(struct vrend_context *ctx, const uint
+       return 0;
+ 
+    if (start_slot > PIPE_MAX_SHADER_BUFFERS ||
+-       start_slot > PIPE_MAX_SHADER_BUFFERS - num_ssbo)
++       num_ssbo > PIPE_MAX_SHADER_BUFFERS - start_slot)
+       return EINVAL;
+ 
+    for (uint32_t i = 0; i < num_ssbo; i++) {
+-- 
+2.34.0
+
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..55792fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch