mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

systemtap: update 4.4 -> 4.5

Browse Source 
Drop 0001-transport-protect-include-and-callsite-with-same-con.patch
as upstream made the same change:
https://sourceware.org/git/?p=systemtap.git;a=commitdiff;h=0d80048e02ecf6876c9f9ebeea387af9fb2a8051

(From OE-Core rev: 1d207eac08d9392b0ae53a2e740aabad72e57750)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-05-24 11:13:47 +02:00
committed by Richard Purdie
parent 58515daf6b
commit 33d1dbeeba
2 changed files with 2 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch
View File

@@ -1,44 +0,0 @@
From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 18 Dec 2020 13:15:08 -0500
Subject: [PATCH] transport: protect include and callsite with same conditional
transport.c has the following code block:
if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS))
Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS.
linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and
must be included or we have a compilation issue.
The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM,
which means that in some configurations we can get out of sync with
the include and the callsite.
If we protect the include and the callsite with the same #ifdef, we can
be sure that they will be consistent.
Upstream-status: Inappropriate (kernel-devsrc specific)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
runtime/transport/transport.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
index bb4a98bd3..88e20ea28 100644
--- a/runtime/transport/transport.c
+++ b/runtime/transport/transport.c
@@ -21,7 +21,7 @@
#include <linux/namei.h>
#include <linux/delay.h>
#include <linux/mutex.h>
-#ifdef CONFIG_SECURITY_LOCKDOWN_LSM
+#ifdef STAPCONF_LOCKDOWN_DEBUGFS
#include <linux/security.h>
#endif
#include "../uidgid_compatibility.h"
--
2.19.1

5
meta/recipes-kernel/systemtap/systemtap_git.inc
View File

@@ -1,13 +1,12 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRCREV = "988f439af39a359b4387963ca4633649866d8275"
PV = "4.4"
SRCREV = "0eba8a46bc99c66e5dd274a9a4d661fe08ac4b8a"
PV = "4.5"
SRC_URI = "git://sourceware.org/git/systemtap.git \
file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
file://0001-Install-python-modules-to-correct-library-dir.patch \
file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
file://0001-transport-protect-include-and-callsite-with-same-con.patch \
"
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux'