1 Star 0 Fork 52

Ya-haha/bcc

forked from src-openEuler/bcc 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0001-CVE-2024-2314-clang-check-header-ownership.patch 2.29 KB
一键复制 编辑 原始数据 按行查看 历史
woody2918 提交于 2024-03-11 09:53 . FIX CVE-2024-2314
From 008ea09e891194c072f2a9305a3c872a241dc342 Mon Sep 17 00:00:00 2001
From: Brendan Gregg <brendan@intel.com>
Date: Thu, 7 Mar 2024 05:27:14 +1100
Subject: [PATCH] clang: check header ownership (#4928)
Example testing with a brendan-owned /tmp/kheaders file (note the "ERROR:" message):
~/bcc/build$ sudo /usr/share/bcc/tools/biosnoop
ERROR: header file ownership unexpected: /tmp/kheaders-5.15.47-internal
<built-in>:1:10: fatal error: './include/linux/kconfig.h' file not found
#include "./include/linux/kconfig.h"
^~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Traceback (most recent call last):
File "/usr/share/bcc/tools/biosnoop", line 335, in <module>
b = BPF(text=bpf_text)
File "/usr/lib/python3/dist-packages/bcc-0.1.5+6cd27218-py3.10.egg/bcc/__init__.py", line 479, in __init__
Exception: Failed to compile BPF module <text>
~/bcc/build$ ls -lhd /tmp/kheaders-5.15.47-internal
drwxrwxr-x 2 brendan dev 4.0K Mar 6 02:50 /tmp/kheaders-5.15.47-internal
No error when chown'd back to root.
---
src/cc/frontends/clang/kbuild_helper.cc | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/cc/frontends/clang/kbuild_helper.cc b/src/cc/frontends/clang/kbuild_helper.cc
index 50e2da9a7bc..d4b9d3e61c7 100644
--- a/src/cc/frontends/clang/kbuild_helper.cc
+++ b/src/cc/frontends/clang/kbuild_helper.cc
@@ -140,15 +140,22 @@ int KBuildHelper::get_flags(const char *uname_machine, vector<string> *cflags) {
return 0;
}
-static inline int file_exists(const char *f)
+static inline int file_exists_and_ownedby(const char *f, uid_t uid)
{
struct stat buffer;
- return (stat(f, &buffer) == 0);
+ int ret;
+ if ((ret = stat(f, &buffer)) == 0) {
+ if (buffer.st_uid != uid) {
+ std::cout << "ERROR: header file ownership unexpected: " << std::string(f) << "\n";
+ return -1;
+ }
+ }
+ return ret;
}
static inline int proc_kheaders_exists(void)
{
- return file_exists(PROC_KHEADERS_PATH);
+ return file_exists_and_ownedby(PROC_KHEADERS_PATH, 0);
}
static inline const char *get_tmp_dir() {
@@ -224,7 +231,7 @@ int get_proc_kheaders(std::string &dirpath)
uname_data.release);
dirpath = std::string(dirpath_tmp);
- if (file_exists(dirpath_tmp))
+ if (file_exists_and_ownedby(dirpath_tmp, 0))
return 0;
// First time so extract it
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/xuezhizone/bcc.git
git@gitee.com:xuezhizone/bcc.git
xuezhizone
bcc
bcc
master

搜索帮助