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

Proposed by Utkarsh Gupta
Status: Merged
Merge reported by: Utkarsh Gupta
Merged at revision: 3b804f04679012ec77b4eebe44c84110555ba6b7
Proposed branch: ~utkarsh/ubuntu/+source/virglrenderer:merge-lp1959175-jammy
Merge into: ubuntu/+source/virglrenderer:debian/experimental
Diff against target: 95 lines (+56/-1)
4 files modified
debian/changelog (+19/-0)
debian/control (+2/-1)
debian/patches/lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch (+34/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Pending
git-ubuntu import Pending
Review via email: mp+416057@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

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.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 095e7bb..75ecc99 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+virglrenderer (0.9.1-1~exp1ubuntu1) jammy; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #1959175). Remaining changes:
9+ - d/p/lp-1950941*: fix out of bounds check (LP #1950941)
10+
11+ -- Utkarsh Gupta <utkarsh@ubuntu.com> Fri, 25 Feb 2022 02:23:43 +0530
12+
13 virglrenderer (0.9.1-1~exp1) experimental; urgency=medium
14
15 * New upstream version 0.9.1
16@@ -11,6 +18,18 @@ virglrenderer (0.9.0-1~exp1) experimental; urgency=medium
17
18 -- Gert Wollny <gewo@debian.org> Tue, 06 Apr 2021 15:24:55 +0200
19
20+virglrenderer (0.8.2-5ubuntu1) jammy; urgency=medium
21+
22+ * d/p/lp-1950941*: fix out of bounds check (LP: #1950941)
23+
24+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 02 Dec 2021 08:34:48 +0100
25+
26+virglrenderer (0.8.2-5build1) impish; urgency=medium
27+
28+ * No-change rebuild to build packages with zstd compression.
29+
30+ -- Matthias Klose <doko@ubuntu.com> Thu, 07 Oct 2021 12:26:08 +0200
31+
32 virglrenderer (0.8.2-5) unstable; urgency=medium
33
34 [ Christian Ehrhardt ]
35diff --git a/debian/control b/debian/control
36index a256720..685f907 100644
37--- a/debian/control
38+++ b/debian/control
39@@ -1,7 +1,8 @@
40 Source: virglrenderer
41 Section: libs
42 Priority: optional
43-Maintainer: Gert Wollny <gewo@debian.org>
44+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45+XSBC-Original-Maintainer: Gert Wollny <gewo@debian.org>
46 Build-Depends: check,
47 debhelper-compat (= 12),
48 libdrm-dev,
49diff --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
50new file mode 100644
51index 0000000..02a6559
52--- /dev/null
53+++ b/debian/patches/lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch
54@@ -0,0 +1,34 @@
55+From 673f4d0c1dfe78f66e8d7f036c619065800022de Mon Sep 17 00:00:00 2001
56+From: Chia-I Wu <olvaffe@gmail.com>
57+Date: Wed, 21 Jul 2021 13:08:12 -0700
58+Subject: [PATCH] vrend: fix boundary check for SSBO state update
59+
60+(PIPE_MAX_SHADER_BUFFERS - num_ssbo) can underflow.
61+
62+Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
63+Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
64+
65+Origin: upstream, https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/673f4d0c1dfe78f66e8d7f036c619065800022de
66+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1950941
67+Last-Update: 2021-12-02
68+
69+---
70+ src/vrend_decode.c | 2 +-
71+ 1 file changed, 1 insertion(+), 1 deletion(-)
72+
73+diff --git a/src/vrend_decode.c b/src/vrend_decode.c
74+index 35ccc23..9fc3552 100644
75+--- a/src/vrend_decode.c
76++++ b/src/vrend_decode.c
77+@@ -1208,7 +1208,7 @@ static int vrend_decode_set_shader_buffers(struct vrend_context *ctx, const uint
78+ return 0;
79+
80+ if (start_slot > PIPE_MAX_SHADER_BUFFERS ||
81+- start_slot > PIPE_MAX_SHADER_BUFFERS - num_ssbo)
82++ num_ssbo > PIPE_MAX_SHADER_BUFFERS - start_slot)
83+ return EINVAL;
84+
85+ for (uint32_t i = 0; i < num_ssbo; i++) {
86+--
87+2.34.0
88+
89diff --git a/debian/patches/series b/debian/patches/series
90new file mode 100644
91index 0000000..55792fb
92--- /dev/null
93+++ b/debian/patches/series
94@@ -0,0 +1 @@
95+lp-1950941-vrend-fix-boundary-check-for-SSBO-state-update.patch

Subscribers

People subscribed via source and target branches