Update fixup patch

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov 2022-04-05 12:30:44 +01:00
parent c227e2b9c3
commit 84bca7d01e
No known key found for this signature in database
GPG Key ID: 21C246FD7C1157A7
2 changed files with 9 additions and 6 deletions

View File

@ -1,7 +1,7 @@
From 75ec2002c702a269062b0fff5443ed4a52571bc7 Mon Sep 17 00:00:00 2001
From 9a0c293c5ea8ca0430d1887b1f2647d0217e222f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 5 Apr 2022 10:48:40 +0100
Subject: [PATCH 245/245] fixup
Subject: [PATCH] fixup
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
@ -9,7 +9,7 @@ Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 0984bd11c..24d219855 100644
index 0984bd11c..4ca436d26 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1057,7 +1057,7 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, st
@ -17,7 +17,7 @@ index 0984bd11c..24d219855 100644
ret = ptrace_peek_area(tid, rseq, decode_pointer(rseqc->rseq_abi_pointer), sizeof(struct rseq));
if (ret) {
- pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq struct\n", tid, (unsigned long)rseq,
+ pr_err("ptrace_peek_area(%d, %lx, %lx, %x): fail to read rseq struct\n", tid, (unsigned long)rseq,
+ pr_err("ptrace_peek_area(%d, %lx, %lx, %lu): fail to read rseq struct\n", tid, (unsigned long)rseq,
(unsigned long)(rseqc->rseq_abi_pointer), sizeof(uint64_t));
return -1;
}
@ -26,7 +26,7 @@ index 0984bd11c..24d219855 100644
ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(rseq->rseq_cs.ptr64), sizeof(struct rseq_cs));
if (ret) {
- pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid,
+ pr_err("ptrace_peek_area(%d, %lx, %lx, %x): fail to read rseq_cs struct\n", tid,
+ pr_err("ptrace_peek_area(%d, %lx, %lx, %lu): fail to read rseq_cs struct\n", tid,
(unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs.ptr64, sizeof(struct rseq_cs));
return -1;
}

View File

@ -17,7 +17,7 @@
Name: criu
Version: 3.16.1
Release: 9%{?dist}
Release: 10%{?dist}
Summary: Tool for Checkpoint/Restore in User-space
License: GPLv2
URL: http://criu.org/
@ -701,6 +701,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a
%doc %{_mandir}/man1/criu-ns.1*
%changelog
* Tue Apr 5 2022 Radostin Stoyanov <rstoyanov@fedoraproject.org> - 3.16.1-10
- Update fixup patch
* Tue Apr 5 2022 Radostin Stoyanov <rstoyanov@fedoraproject.org> - 3.16.1-9
- Update rseq support patches