March 2025 - Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 0/2] CVE-2024-52560
by Yongjian Sun 31 Mar '25

31 Mar '25

Konstantin Komarov (2): [Backport] fs/ntfs3: Mark inode as bad as soon as error detected in mi_enum_attr() [Backport] fs/ntfs3: Unify inode corruption marking with _ntfs_bad_inode() fs/ntfs3/attrib.c | 13 ++++---- fs/ntfs3/dir.c | 2 +- fs/ntfs3/frecord.c | 71 +++++++++++++++++++++++-------------------- fs/ntfs3/fsntfs.c | 6 +++- fs/ntfs3/index.c | 6 ++-- fs/ntfs3/inode.c | 3 ++ fs/ntfs3/ntfs_fs.h | 21 ++++++------- fs/ntfs3/record.c | 75 ++++++++++++++++++++++++---------------------- 8 files changed, 107 insertions(+), 90 deletions(-) -- 2.39.2

2 3

[PATCH openEuler-1.0-LTS] phy: qcom-qmp: fix reset-controller leak on probe errors
by Ye Bin 31 Mar '25

31 Mar '25

From: Johan Hovold <johan+linaro(a)kernel.org> stable inclusion from stable-v4.19.247 commit a39d9eccb333b8c07c43ebea1c6dfda122378a0f category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP74Q CVE: CVE-2022-49396 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ------------------------------------------- commit 4d2900f20edfe541f75756a00deeb2ffe7c66bc1 upstream. Make sure to release the lane reset controller in case of a late probe error (e.g. probe deferral). Note that due to the reset controller being defined in devicetree in "lane" child nodes, devm_reset_control_get_exclusive() cannot be used directly. Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets") Cc: stable(a)vger.kernel.org # 4.12 Cc: Vivek Gautam <vivek.gautam(a)codeaurora.org> Reviewed-by: Philipp Zabel <p.zabel(a)pengutronix.de> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> Reviewed-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> Link: https://lore.kernel.org/r/20220427063243.32576-3-johan+linaro@kernel.org Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Ye Bin <yebin10(a)huawei.com> --- drivers/phy/qualcomm/phy-qcom-qmp.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 4c470104a0d6..ae1b2847b52d 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -1424,6 +1424,11 @@ static const struct phy_ops qcom_qmp_phy_gen_ops = { .owner = THIS_MODULE, }; +static void qcom_qmp_reset_control_put(void *data) +{ + reset_control_put(data); +} + static int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) { @@ -1488,6 +1493,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) dev_err(dev, "failed to get lane%d reset\n", id); return PTR_ERR(qphy->lane_rst); } + ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put, + qphy->lane_rst); + if (ret) + return ret; } generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_gen_ops); -- 2.34.1

2 1

[PATCH OLK-6.6 v2 0/8] Add support for IPIv
by Jinqian Yang 31 Mar '25

31 Mar '25

Patch#1 Allocate VM table and save vpeid in it Patch#2 avoid sending multi-SGIs in IPIV Patch#3 Set base address of vm table and targe ITS when vpe schedule and deschedule Patch#4 Register ipiv exception interrupt Patch#5 Add interface KVM_CAP_ARM_IPIV_MODE Patch#6 Probe and configure IPIV capacity on HIP12 Patch#7 Pre-allocate vpe id for direct mode Patch#8 Add support for ipiv direct mode Xiang Chen (7): kvm: hisi_virt: Allocate VM table and save vpeid in it irqchip: gicv3-its: Set base address of vm table and targe ITS when vpe schedule and deschedule kvm: hisi_virt: Register ipiv exception interrupt kvm: arm64: Add interface KVM_CAP_ARM_IPIV_MODE kvm: hisi_virt: Probe and configure IPIV capacity on HIP12 kvm: hisi_virt: Pre-allocate vpe id for direct mode kvm: hisi_virt: Add support for ipiv direct mode yangjinqian (1): KVM: arm64: avoid sending multi-SGIs in IPIV .../admin-guide/kernel-parameters.txt | 8 ++ arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/arm.c | 21 ++++ arch/arm64/kvm/hisilicon/hisi_virt.c | 42 +++++++ arch/arm64/kvm/hisilicon/hisi_virt.h | 11 ++ arch/arm64/kvm/sys_regs.c | 44 +++++-- arch/arm64/kvm/vgic/vgic-init.c | 84 ++++++++++++- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 + drivers/irqchip/irq-gic-v3-its.c | 114 ++++++++++++++++-- drivers/irqchip/irq-gic-v3.c | 42 +++++++ include/kvm/arm_vgic.h | 2 + include/linux/irqchip/arm-gic-v3.h | 24 ++++ include/linux/irqchip/arm-gic-v4.h | 3 + include/uapi/linux/kvm.h | 2 + 14 files changed, 380 insertions(+), 20 deletions(-) -- 2.33.0

2 9

[PATCH openEuler-testcase] TEST: add Dynamic Memory Bandwidth Regulator and Tracer
by Zeng Heng 31 Mar '25

31 Mar '25

Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- bw_dynamic.py | 184 ++++++++++++++++++++++++++++++++++++++++++++++ calc_cpu_usage.py | 27 +++++++ draw_bw.py | 105 ++++++++++++++++++++++++++ draw_cpu.py | 34 +++++++++ draw_llc.py | 66 +++++++++++++++++ pidcontroller.py | 35 +++++++++ 6 files changed, 451 insertions(+) create mode 100644 bw_dynamic.py create mode 100644 calc_cpu_usage.py create mode 100644 draw_bw.py create mode 100644 draw_cpu.py create mode 100644 draw_llc.py create mode 100644 pidcontroller.py diff --git a/bw_dynamic.py b/bw_dynamic.py new file mode 100644 index 000000000000..51509928aef0 --- /dev/null +++ b/bw_dynamic.py @@ -0,0 +1,184 @@ +import os, time, signal, json, sys +from pidcontroller import PIDController +from calc_cpu_usage import read_cpu_times, calculate_cpu_utilization + +numa_bw_limit = 80000 +lc_grp = "." +be_grp = "p1" + +bw_list = [] +llc_list = [] +set_list = [] +cpu_list = [] + +def read_bw(grp): + resctrl_mon_data_dir = '/sys/fs/resctrl/%s/mon_data/' % grp + mon_data_dirs = os.listdir(resctrl_mon_data_dir) + mon_MB_dirs = [dir for dir in mon_data_dirs if dir.startswith('mon_MB_')] + + vals = [] + for mb_dir in mon_MB_dirs: + with open(resctrl_mon_data_dir + mb_dir + '/mbm_total_bytes', 'r') as f: + line = f.readline() + vals.append(int(line.strip())) + + return vals + +def increase_bw(i, percent): + print("increase NUMA%d %d%%" % (i, percent)) + + resctrl_par_dir = '/sys/fs/resctrl/%s/schemata' % be_grp + with open(resctrl_par_dir, 'r') as f: + lines = f.readlines() + + for line in lines: + if "MB:" in line: + config = line.split(":") + config = config[1].split(";") + origin_p = int(config[i].split("=")[1]) + + new_p = (origin_p + percent) + if new_p > 100: + new_p = 100 + elif new_p < 8: + new_p = 8 + + # if percent < 0: + # cnt = "MBHDL:%d=1\n" % i + # with open(resctrl_par_dir, 'w+') as f: + # f.write(cnt) + + cnt = "MB:%d=%d" % (i, new_p) + print("%s<=%d" % (cnt, origin_p)) + if new_p == origin_p: + return origin_p + + with open(resctrl_par_dir, 'w+') as f: + f.write("%s\n" % cnt) + + return origin_p + +def gain_numa_bw(pid_ctl, adjust_enable, target_percent): + lc_val = read_bw(lc_grp) + be_val = read_bw(be_grp) + + numa_bw_state = [] + numa_set = [] + + for i in range(len(lc_val)): + bw_state = {"total_bw": {}, "lc_bw": {}, "be_bw": {}} + + bw_sum = lc_val[i] + be_val[i] + + bw_state["total_bw"] = bw_sum + bw_state["lc_bw"] = lc_val[i] + bw_state["be_bw"] = be_val[i] + numa_bw_state.append(bw_state) + + set_state = {"setting": {}, "delta": {}} + + if adjust_enable == True: + if bw_state["lc_bw"] < (0.04 * numa_bw_limit): + # enlarge BE load + diff = 5 + elif bw_state["lc_bw"] > (target_percent / 100 * numa_bw_limit): + # shutdown BE load + diff = -100 + else: + diff = pid_ctl[i].update(bw_sum * 100 // numa_bw_limit , 1) + else: + diff = 0 + + curr = increase_bw(i, diff) + set_state['setting'] = curr + set_state['delta'] = diff + + numa_set.append(set_state) + + bw_list.append(numa_bw_state) + set_list.append(numa_set) + return + +def read_llc(grp): + resctrl_mon_data_dir = '/sys/fs/resctrl/%s/mon_data/' % grp + mon_data_dirs = os.listdir(resctrl_mon_data_dir) + mon_MB_dirs = [dir for dir in mon_data_dirs if dir.startswith('mon_L3_')] + + vals = [] + for mb_dir in mon_MB_dirs: + with open(resctrl_mon_data_dir + mb_dir + '/llc_occupancy', 'r') as f: + line = f.readline() + vals.append(int(line.strip())) + + return vals + +def gain_numa_llc(): + lc_llc = read_llc(lc_grp) + be_llc = read_llc(be_grp) + + numa_llc_state = [] + + for i in range(len(lc_llc)): + llc_state = {"total_llc": {}, "lc_llc": {}, "be_llc": {}} + + total_llc = lc_llc[i] + be_llc[i] + llc_state["total_llc"] = total_llc + + llc_state["lc_llc"] = lc_llc[i] + llc_state["be_llc"] = be_llc[i] + numa_llc_state.append(llc_state) + + llc_list.append(numa_llc_state) + return + +def gain_cpu(time1, time2): + usage = calculate_cpu_utilization(time1, time2) + print(f"CPU usage: {usage:.2f}%") + cpu_list.append(usage) + return + +def save_file(sig, frame): + with open(f"ctrlgrp_bw.data", 'w') as fl: + json.dump(bw_list, fl) + + with open(f"schemata_set.data", 'w') as fl: + json.dump(set_list, fl) + + with open(f"ctrlgrp_llc.data", 'w') as fl: + json.dump(llc_list, fl) + + with open(f"cpu_usage.data", 'w') as fl: + json.dump(cpu_list, fl) + + exit(0) + +if __name__ == "__main__": + signal.signal(signal.SIGINT, save_file) + + enable = True + target_percent = 60 + + num_args = len(sys.argv) - 1 + if num_args == 1 and sys.argv[1].isdigit(): + target_percent = int(sys.argv[1]) + else: + enable = False + + pid_ctl = [] + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + + time1 = read_cpu_times() + + while True: + gain_numa_bw(pid_ctl, enable, target_percent) + gain_numa_llc() + + time2 = read_cpu_times() + gain_cpu(time1, time2) + time1 = time2 + + print("..........................") + time.sleep(1) diff --git a/calc_cpu_usage.py b/calc_cpu_usage.py new file mode 100644 index 000000000000..98fef7a2c1f5 --- /dev/null +++ b/calc_cpu_usage.py @@ -0,0 +1,27 @@ +import time + +def read_cpu_times(): + with open('/proc/stat', 'r') as f: + line = f.readline() + parts = line.split() + return list(map(int, parts[1:])) + +def calculate_cpu_utilization(times1, times2): + total1 = sum(times1) + idle1 = times1[3] + total2 = sum(times2) + idle2 = times2[3] + total_diff = total2 - total1 + idle_diff = idle2 - idle1 + return (total_diff - idle_diff) / total_diff * 100 + +# def gain_cpu(time1, time2): +# usage = calculate_cpu_utilization(time1, time2) +# print(f"CPU usage: {usage:.2f}%") +# return time2 + +# time1 = read_cpu_times() +# while True: +# time.sleep(1) +# time2 = read_cpu_times() +# time1 = gain_cpu(time1, time2) diff --git a/draw_bw.py b/draw_bw.py new file mode 100644 index 000000000000..17f28842cbcc --- /dev/null +++ b/draw_bw.py @@ -0,0 +1,105 @@ +import json +import matplotlib.pyplot as plt + +target_percent = 60 / 100 +bw_limit = target_percent * 80000 + +def get_all_bw(data_list, idx): + total = [] + lc = [] + be = [] + + for data in data_list: + total.append(data[idx]['total_bw']) + lc.append(data[idx]['lc_bw']) + be.append(data[idx]['be_bw']) + + return total, lc, be + +def get_all_set(set_list, idx): + setting = [] + delta = [] + + for data in set_list: + setting.append(data[idx]['setting']) + delta.append(data[idx]['delta']) + + return setting, delta + +def draw_data(bw_list, set_list, cpu_list): + fig = plt.figure() + x_arr = list(range(len(bw_list))) + + # numa_cnt = len(bw_list[0]) + # only draw numa1 + numa_cnt_display = 1 + numa_th = 1 + for cnt in range(numa_cnt_display): + ax1 = fig.add_subplot(numa_cnt_display * 2 + 1, 1, cnt * 2 + 1) + # total, lc, be = get_all_bw(bw_list, cnt) + total, lc, be = get_all_bw(bw_list, numa_th) + ref = [bw_limit] * len(bw_list) + + ax1.plot(x_arr, total, label='total bw') + ax1.plot(x_arr, lc, label='lc bw') + ax1.plot(x_arr, be, label='be bw') + ax1.plot(x_arr, ref, label='reference') + ax1.legend() + + ax2 = fig.add_subplot(numa_cnt_display * 2 + 1, 1, cnt * 2 + 2) + # setting, delta = get_all_set(set_list, cnt) + setting, delta = get_all_set(set_list, numa_th) + + ref = [0] * len(bw_list) + ax2.plot(x_arr, setting, label='setting') + ax2.plot(x_arr, delta, label='delta') + ax2.plot(x_arr, ref, label='reference') + ax2.legend() + + # ax3 = fig.add_subplot(5, 1, 3) + # total, lc, be = get_all_bw(bw_list, 1) + + # ax3.plot(x_arr, total, label='total bw') + # ax3.plot(x_arr, lc, label='lc bw') + # ax3.plot(x_arr, be, label='be bw') + # ax3.plot(x_arr, ref, label='reference') + # ax3.legend() + + # ax4 = fig.add_subplot(5, 1, 4) + # setting, delta = get_all_set(set_list, 1) + + # ax4.plot(x_arr, setting, label='setting') + # ax4.plot(x_arr, delta, label='delta') + # ax4.legend() + + ax5 = fig.add_subplot(numa_cnt_display * 2 + 1, 1, numa_cnt_display * 2 + 1) + + ax5.plot(x_arr, cpu_list, label='CPU usage') + ax5.legend() + + plt.tight_layout() + plt.show() + + return + +def get_data(file): + try: + with open(file, 'r') as f: + data_list = json.load(f) + except FileNotFoundError: + return None + + return data_list + +if __name__ == '__main__': + filename = 'ctrlgrp_bw.data' + bw_list = get_data(filename) + filename = 'schemata_set.data' + set_list = get_data(filename) + filename = 'cpu_usage.data' + cpu_list = get_data(filename) + + if bw_list and set_list: + draw_data(bw_list, set_list, cpu_list) + else: + print('FileNotFound') diff --git a/draw_cpu.py b/draw_cpu.py new file mode 100644 index 000000000000..02e5b0e48376 --- /dev/null +++ b/draw_cpu.py @@ -0,0 +1,34 @@ +import json +import matplotlib.pyplot as plt + +def draw_data(cpu_list): + fig = plt.figure() + x_arr = list(range(len(cpu_list))) + + ax1 = fig.add_subplot(1, 1, 1) + + ax1.plot(x_arr, cpu_list, label='CPU usage') + ax1.legend() + + plt.tight_layout() + plt.show() + + return + +def get_data(file): + try: + with open(file, 'r') as f: + cpu_list = json.load(f) + except FileNotFoundError: + return None + + return cpu_list + +if __name__ == '__main__': + filename = 'cpu_usage.data' + cpu_list = get_data(filename) + + if cpu_list: + draw_data(cpu_list) + else: + print('FileNotFound') diff --git a/draw_llc.py b/draw_llc.py new file mode 100644 index 000000000000..7538eac3925d --- /dev/null +++ b/draw_llc.py @@ -0,0 +1,66 @@ +import json +import matplotlib.pyplot as plt + +def get_all_llc(data_list, idx): + total = [] + lc = [] + be = [] + + for data in data_list: + total.append(data[idx]['total_llc'] / 1000) + lc.append(data[idx]['lc_llc'] / 1000) + be.append(data[idx]['be_llc'] / 1000) + + return total, lc, be + +def draw_data(llc_list, cpu_list): + fig = plt.figure() + x_arr = list(range(len(llc_list))) + + # only draw numa1 + numa_cnt_display = 1 + numa_th = 0 + for cnt in range(numa_cnt_display): + ax1 = fig.add_subplot(numa_cnt_display + 1, 1, cnt + 1) + total, lc, be = get_all_llc(llc_list, numa_th) + + ax1.plot(x_arr, total, label='total llc') + ax1.plot(x_arr, lc, label='lc llc') + ax1.plot(x_arr, be, label='be llc') + + ax1.set_ylabel(f"L3 Cache (kB)") + ax1.set_xlabel(f"Time (s)") + ax1.legend() + + ax2 = fig.add_subplot(numa_cnt_display + 1, 1, numa_cnt_display + 1) + ax2.plot(x_arr, cpu_list, label='CPU usage') + + ax2.set_ylabel(f"CPU Load (%)") + ax2.set_xlabel(f"Time (s)") + + ax2.legend() + + plt.tight_layout() + plt.show() + + return + +def get_data(file): + try: + with open(file, 'r') as f: + data_list = json.load(f) + except FileNotFoundError: + return None + + return data_list + +if __name__ == '__main__': + filename = 'ctrlgrp_llc.data' + llc_list = get_data(filename) + filename = 'cpu_usage.data' + cpu_list = get_data(filename) + + if llc_list: + draw_data(llc_list, cpu_list) + else: + print('FileNotFound') diff --git a/pidcontroller.py b/pidcontroller.py new file mode 100644 index 000000000000..4d03d2f28aa1 --- /dev/null +++ b/pidcontroller.py @@ -0,0 +1,35 @@ +class PIDController: + def __init__(self, kp, ki, kd, set_point): + self.kp = kp # 比例增益 + self.ki = ki # 积分增益 + self.kd = kd # 微分增益 + self.set_point = set_point # 设定值 + self.last_error = 0 # 上一次的误差 + self.integral = 0 # 积分项 + + self.max_output = 5 # 缓升 + self.min_output = -100 # 快降 + + def update(self, current_value, dt): + """ + 更新PID控制器的输出 + :param current_value: 当前系统的输出值 + :param dt: 时间间隔 + :return: 控制器的输出 + """ + error = self.set_point - current_value # 计算当前误差 + self.integral += error * dt # 更新积分项 + derivative = (error - self.last_error) / dt # 计算微分项 + + # 计算PID控制器的输出 + output = (self.kp * error) + (self.ki * self.integral) + (self.kd * derivative) + + self.last_error = error # 更新上一次的误差 + + # 限制输出范围 + if output > self.max_output: + output = self.max_output + elif output < self.min_output: + output = self.min_output + + return output -- 2.25.1

1 0

[openeuler:openEuler-1.0-LTS 1541/1541] kernel/trace/.tmp_trace_output.o: warning: objtool: missing symbol for section .init.text
by kernel test robot 31 Mar '25

31 Mar '25

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: c09d565ea3e651c408ca3d0e0c2499e5e90a77ae commit: 31bf327231bb582ec7dca0490cc90c364b36e095 [1541/1541] tracing: Make sure trace_printk() can output as soon as it can be used config: x86_64-buildonly-randconfig-003-20250331 (https://download.01.org/0day-ci/archive/20250331/202503312102.s1xJYVFA-lkp@…) compiler: clang version 20.1.1 (https://github.com/llvm/llvm-project 424c2d9b7e4de40d0804dd374721e6411c27d1d1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250331/202503312102.s1xJYVFA-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202503312102.s1xJYVFA-lkp@intel.com/ All warnings (new ones prefixed by >>): >> kernel/trace/.tmp_trace_output.o: warning: objtool: missing symbol for section .init.text -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-testcase] TEST: add Dynamic Memory Bandwidth Regulator and Tracer
by Zeng Heng 31 Mar '25

31 Mar '25

Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- bw_dynamic.py | 184 ++++++++++++++++++++++++++++++++++++++++++++++ calc_cpu_usage.py | 27 +++++++ draw_bw.py | 105 ++++++++++++++++++++++++++ draw_cpu.py | 34 +++++++++ pidcontroller.py | 35 +++++++++ 5 files changed, 385 insertions(+) create mode 100644 bw_dynamic.py create mode 100644 calc_cpu_usage.py create mode 100644 draw_bw.py create mode 100644 draw_cpu.py create mode 100644 pidcontroller.py diff --git a/bw_dynamic.py b/bw_dynamic.py new file mode 100644 index 000000000000..fff0a389094a --- /dev/null +++ b/bw_dynamic.py @@ -0,0 +1,184 @@ +import os, time, signal, json, sys +from pidcontroller import PIDController +from calc_cpu_usage import read_cpu_times, calculate_cpu_utilization + +numa_bw_limit = 80000 +lc_grp = "." +be_grp = "p1" + +bw_list = [] +llc_list = [] +set_list = [] +cpu_list = [] + +def read_bw(grp): + resctrl_mon_data_dir = '/sys/fs/resctrl/%s/mon_data/' % grp + mon_data_dirs = os.listdir(resctrl_mon_data_dir) + mon_MB_dirs = [dir for dir in mon_data_dirs if dir.startswith('mon_MB_')] + + vals = [] + for mb_dir in mon_MB_dirs: + with open(resctrl_mon_data_dir + mb_dir + '/mbm_total_bytes', 'r') as f: + line = f.readline() + vals.append(int(line.strip())) + + return vals + +def increase_bw(i, percent): + print("increase NUMA%d %d%%" % (i, percent)) + + resctrl_par_dir = '/sys/fs/resctrl/%s/schemata' % be_grp + with open(resctrl_par_dir, 'r') as f: + lines = f.readlines() + + for line in lines: + if "MB:" in line: + config = line.split(":") + config = config[1].split(";") + origin_p = int(config[i].split("=")[1]) + + new_p = (origin_p + percent) + if new_p > 100: + new_p = 100 + elif new_p < 8: + new_p = 8 + + # if percent < 0: + # cnt = "MBHDL:%d=1\n" % i + # with open(resctrl_par_dir, 'w+') as f: + # f.write(cnt) + + cnt = "MB:%d=%d" % (i, new_p) + print("%s<=%d" % (cnt, origin_p)) + if new_p == origin_p: + return origin_p + + with open(resctrl_par_dir, 'w+') as f: + f.write("%s\n" % cnt) + + return origin_p + +def gain_numa_bw(pid_ctl, adjust_enable, target_percent): + lc_val = read_bw(lc_grp) + be_val = read_bw(be_grp) + + numa_bw_state = [] + numa_set = [] + + for i in range(len(lc_val)): + bw_state = {"total_bw": {}, "lc_bw": {}, "be_bw": {}} + + bw_sum = lc_val[i] + be_val[i] + + bw_state["total_bw"] = bw_sum + bw_state["lc_bw"] = lc_val[i] + bw_state["be_bw"] = be_val[i] + numa_bw_state.append(bw_state) + + set_state = {"setting": {}, "delta": {}} + + if adjust_enable == True: + if bw_state["lc_bw"] < (0.04 * numa_bw_limit): + # enlarge BE load + diff = 5 + elif bw_state["lc_bw"] > (target_percent / 100 * numa_bw_limit): + # shutdown BE load + diff = -100 + else: + diff = pid_ctl[i].update(bw_sum * 100 // numa_bw_limit , 1) + else: + diff = 0 + + curr = increase_bw(i, diff) + set_state['setting'] = curr + set_state['delta'] = diff + + numa_set.append(set_state) + + bw_list.append(numa_bw_state) + set_list.append(numa_set) + return + +def read_llc(grp): + resctrl_mon_data_dir = '/sys/fs/resctrl/%s/mon_data/' % grp + mon_data_dirs = os.listdir(resctrl_mon_data_dir) + mon_MB_dirs = [dir for dir in mon_data_dirs if dir.startswith('mon_L3_')] + + vals = [] + for mb_dir in mon_MB_dirs: + with open(resctrl_mon_data_dir + mb_dir + '/llc_occupancy', 'r') as f: + line = f.readline() + vals.append(int(line.strip())) + + return vals + +def gain_numa_llc(): + lc_llc = read_llc(lc_grp) + be_llc = read_llc(be_grp) + + numa_llc_state = [] + + for i in range(len(lc_llc)): + llc_state = {"total_llc": {}, "lc_llc": {}, "be_llc": {}} + + total_llc = lc_llc[i] + be_llc[i] + llc_state["total_llc"] = total_llc + + llc_state["lc_llc"] = lc_llc[i] + llc_state["be_llc"] = be_llc[i] + numa_llc_state.append(llc_state) + + llc_list.append(numa_llc_state) + return + +def gain_cpu(time1, time2): + usage = calculate_cpu_utilization(time1, time2) + print(f"CPU usage: {usage:.2f}%") + cpu_list.append(usage) + return + +def save_file(sig, frame): + with open(f"ctrlgrp_bw.data", 'w') as fl: + json.dump(bw_list, fl) + + with open(f"schemata_set.data", 'w') as fl: + json.dump(set_list, fl) + + with open(f"ctrlgrp_llc.data", 'w') as fl: + json.dump(llc_list, fl) + + with open(f"cpu_usage.data", 'w') as fl: + json.dump(cpu_list, fl) + + exit(0) + +if __name__ == "__main__": + signal.signal(signal.SIGINT, save_file) + + enable = True + target_percent = 60 + + num_args = len(sys.argv) - 1 + if num_args == 1 and sys.argv[1].isdigit(): + target_percent = int(sys.argv[1]) + else: + enable = False + + pid_ctl = [] + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + pid_ctl.append(PIDController(kp=1.0, ki=0.02, kd=0.05, set_point=target_percent)) + + time1 = read_cpu_times() + + while True: + gain_numa_bw(pid_ctl, enable, target_percent) + gain_numa_llc() + + time2 = read_cpu_times() + gain_cpu(time1, time2) + time1 = time2 + + print("..........................") + time.sleep(1) diff --git a/calc_cpu_usage.py b/calc_cpu_usage.py new file mode 100644 index 000000000000..98fef7a2c1f5 --- /dev/null +++ b/calc_cpu_usage.py @@ -0,0 +1,27 @@ +import time + +def read_cpu_times(): + with open('/proc/stat', 'r') as f: + line = f.readline() + parts = line.split() + return list(map(int, parts[1:])) + +def calculate_cpu_utilization(times1, times2): + total1 = sum(times1) + idle1 = times1[3] + total2 = sum(times2) + idle2 = times2[3] + total_diff = total2 - total1 + idle_diff = idle2 - idle1 + return (total_diff - idle_diff) / total_diff * 100 + +# def gain_cpu(time1, time2): +# usage = calculate_cpu_utilization(time1, time2) +# print(f"CPU usage: {usage:.2f}%") +# return time2 + +# time1 = read_cpu_times() +# while True: +# time.sleep(1) +# time2 = read_cpu_times() +# time1 = gain_cpu(time1, time2) diff --git a/draw_bw.py b/draw_bw.py new file mode 100644 index 000000000000..c2c309ea1fd9 --- /dev/null +++ b/draw_bw.py @@ -0,0 +1,105 @@ +import json +import matplotlib.pyplot as plt + +target_percent = 60 / 100 +bw_limit = target_percent * 80000 + +def get_all_bw(data_list, idx): + total = [] + lc = [] + be = [] + + for data in data_list: + total.append(data[idx]['total_bw']) + lc.append(data[idx]['lc_bw']) + be.append(data[idx]['be_bw']) + + return total, lc, be + +def get_all_set(set_list, idx): + setting = [] + delta = [] + + for data in set_list: + setting.append(data[idx]['setting']) + delta.append(data[idx]['delta']) + + return setting, delta + +def draw_data(bw_list, set_list, cpu_list): + fig = plt.figure() + x_arr = list(range(len(bw_list))) + + # numa_cnt = len(bw_list[0]) + # only draw numa1 + numa_cnt_display = 1 + numa_th = 1 + for cnt in range(numa_cnt_display): + ax1 = fig.add_subplot(numa_cnt_display * 2 + 1, 1, cnt * 2 + 1) + # total, lc, be = get_all_bw(bw_list, cnt) + total, lc, be = get_all_bw(bw_list, numa_th) + ref = [bw_limit] * len(bw_list) + + ax1.plot(x_arr, total, label='total bw') + ax1.plot(x_arr, lc, label='lc bw') + ax1.plot(x_arr, be, label='be bw') + ax1.plot(x_arr, ref, label='reference') + ax1.legend() + + ax2 = fig.add_subplot(numa_cnt_display * 2 + 1, 1, cnt * 2 + 2) + # setting, delta = get_all_set(set_list, cnt) + setting, delta = get_all_set(set_list, numa_th) + + ref = [0] * len(bw_list) + ax2.plot(x_arr, setting, label='setting') + ax2.plot(x_arr, delta, label='delta') + ax2.plot(x_arr, ref, label='reference') + ax2.legend() + + # ax3 = fig.add_subplot(5, 1, 3) + # total, lc, be = get_all_bw(bw_list, 1) + + # ax3.plot(x_arr, total, label='total bw') + # ax3.plot(x_arr, lc, label='lc bw') + # ax3.plot(x_arr, be, label='be bw') + # ax3.plot(x_arr, ref, label='reference') + # ax3.legend() + + # ax4 = fig.add_subplot(5, 1, 4) + # setting, delta = get_all_set(set_list, 1) + + # ax4.plot(x_arr, setting, label='setting') + # ax4.plot(x_arr, delta, label='delta') + # ax4.legend() + + ax5 = fig.add_subplot(numa_cnt_display * 2 + 1, 1, numa_cnt_display * 2 + 1) + + ax5.plot(x_arr, cpu_list, label='CPU usage') + ax5.legend() + + plt.tight_layout() + plt.show() + + return + +def get_data(file): + try: + with open(file, 'r') as f: + data_list = json.load(f) + except FileNotFoundError: + return None + + return data_list + +if __name__ == '__main__': + filename = 'ctrlgrp_bw.data' + bw_list = get_data(filename) + filename = 'schemata_set.data' + set_list = get_data(filename) + filename = 'cpu_usage.data' + cpu_list = get_data(filename) + + if bw_list and set_list: + draw_data(bw_list, set_list, cpu_list) + else: + print('FileNotFound') diff --git a/draw_cpu.py b/draw_cpu.py new file mode 100644 index 000000000000..e69cf24b6b08 --- /dev/null +++ b/draw_cpu.py @@ -0,0 +1,34 @@ +import json +import matplotlib.pyplot as plt + +def draw_data(cpu_list): + fig = plt.figure() + x_arr = list(range(len(cpu_list))) + + ax1 = fig.add_subplot(1, 1, 1) + + ax1.plot(x_arr, cpu_list, label='CPU usage') + ax1.legend() + + plt.tight_layout() + plt.show() + + return + +def get_data(file): + try: + with open(file, 'r') as f: + cpu_list = json.load(f) + except FileNotFoundError: + return None + + return cpu_list + +if __name__ == '__main__': + filename = 'cpu_usage.data' + cpu_list = get_data(filename) + + if cpu_list: + draw_data(cpu_list) + else: + print('FileNotFound') diff --git a/pidcontroller.py b/pidcontroller.py new file mode 100644 index 000000000000..d67f9d2ad10c --- /dev/null +++ b/pidcontroller.py @@ -0,0 +1,35 @@ +class PIDController: + def __init__(self, kp, ki, kd, set_point): + self.kp = kp # 比例增益 + self.ki = ki # 积分增益 + self.kd = kd # 微分增益 + self.set_point = set_point # 设定值 + self.last_error = 0 # 上一次的误差 + self.integral = 0 # 积分项 + + self.max_output = 5 # 缓升 + self.min_output = -100 # 快降 + + def update(self, current_value, dt): + """ + 更新PID控制器的输出 + :param current_value: 当前系统的输出值 + :param dt: 时间间隔 + :return: 控制器的输出 + """ + error = self.set_point - current_value # 计算当前误差 + self.integral += error * dt # 更新积分项 + derivative = (error - self.last_error) / dt # 计算微分项 + + # 计算PID控制器的输出 + output = (self.kp * error) + (self.ki * self.integral) + (self.kd * derivative) + + self.last_error = error # 更新上一次的误差 + + # 限制输出范围 + if output > self.max_output: + output = self.max_output + elif output < self.min_output: + output = self.min_output + + return output -- 2.25.1

1 0

[PATCH OLK-6.6] vhost/vdpa: Add support to bind, unbind, attach and detach iommufd
by frenkjason 31 Mar '25

31 Mar '25

From: frankyj915 <yangjieyj.yang(a)huawei.com> VHOST_VDPA_BIND_IOMMUFD, VHOST_VDPA_UNBIND_IOMMUFD, VHOST_VDPA_ATTACH_IOMMUFD_PT and VHOST_VDPA_DETACH_IOMMUFD_PT are introduced. Signed-off-by: frankyj915 <yangjieyj.yang(a)huawei.com> --- drivers/vhost/vdpa.c | 105 +++++++++++++++++++++++++++++++ include/uapi/linux/vhost.h | 28 +++++++++ include/uapi/linux/vhost_types.h | 5 ++ tools/include/uapi/linux/vhost.h | 28 +++++++++ 4 files changed, 166 insertions(+) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index ef7009a9d5ec..6d18e8cca2f0 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -22,9 +22,12 @@ #include <linux/vdpa.h> #include <linux/nospec.h> #include <linux/vhost.h> +#include <linux/iommufd.h> #include "vhost.h" +MODULE_IMPORT_NS(IOMMUFD); + enum { VHOST_VDPA_BACKEND_FEATURES = (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2) | @@ -60,6 +63,8 @@ struct vhost_vdpa { int in_batch; struct vdpa_iova_range range; u32 batch_asid; + struct iommufd_device *iommufd_dev; + bool iommufd_attached; }; static DEFINE_IDA(vhost_vdpa_ida); @@ -569,6 +574,89 @@ static long vhost_vdpa_resume(struct vhost_vdpa *v) return ops->resume(vdpa); } +static long vhost_vdpa_bind_iommufd(struct vhost_vdpa *v, int __user *argp) +{ + struct vhost_vdpa_bind_iommufd bind; + struct iommufd_ctx *iommufd_ctx; + struct iommufd_device *idev; + struct device *dma_dev = vdpa_get_dma_dev(v->vdpa); + struct iommu_group *iommu_group = iommu_group_get(dma_dev); + int ret; + + if (copy_from_user(&bind, argp, sizeof(bind))) + return -EFAULT; + + iommufd_ctx = iommufd_ctx_from_fd(bind.iommufd); + if (IS_ERR(iommufd_ctx)) + return PTR_ERR(iommufd_ctx); + + if (v->domain) { + iommu_detach_device(v->domain, dma_dev); + iommu_domain_free(v->domain); + v->domain = NULL; + } + + // Default iommu domain is created when vdpa device driver probes. + // Unuse default domain first to avoid failure when claiming dma owner. + if (dma_dev->bus && dma_dev->bus->dma_cleanup) + dma_dev->bus->dma_cleanup(dma_dev); + ret = iommu_group_claim_dma_owner(iommu_group, iommufd_ctx); + if (ret) + return ret; + + idev = iommufd_device_bind(iommufd_ctx, dma_dev, &bind.out_devid); + if (IS_ERR(idev)) + return PTR_ERR(idev); + v->iommufd_dev = idev; + + if (copy_to_user(argp, &bind, sizeof(bind))) + return -EFAULT; + return 0; +} + +static long vhost_vdpa_attach_iommufd_pt(struct vhost_vdpa *v, u32 __user *argp) +{ + u32 pt_id = 0; + int ret; + + if (copy_from_user(&pt_id, argp, sizeof(pt_id))) + return -EFAULT; + + ret = iommufd_device_attach(v->iommufd_dev, &pt_id); + if (ret) + return ret; + v->iommufd_attached = true; + + if (copy_to_user(argp, &pt_id, sizeof(pt_id))) + return -EFAULT; + return 0; +} + +static void vhost_vdpa_detach_iommufd_pt(struct vhost_vdpa *v) +{ + if (WARN_ON(!v->iommufd_dev) || !v->iommufd_attached) + return; + + iommufd_device_detach(v->iommufd_dev); + v->iommufd_attached = false; +} + +static void vhost_vdpa_unbind_iommufd(struct vhost_vdpa *v) +{ + struct device *dma_dev = vdpa_get_dma_dev(v->vdpa); + struct iommu_group *iommu_group = iommu_group_get(dma_dev); + + if (!v->iommufd_dev) + return; + + vhost_vdpa_detach_iommufd_pt(v); + iommufd_device_unbind(v->iommufd_dev); + v->iommufd_dev = NULL; + iommu_group_release_dma_owner(iommu_group); + if (dma_dev->bus && dma_dev->bus->dma_configure) + dma_dev->bus->dma_configure(dma_dev); +} + #ifdef CONFIG_VHOST_VDPA_MIGRATION static int vhost_vdpa_get_dev_buffer_size(struct vhost_vdpa *v, uint32_t __user *argp) @@ -916,6 +1004,18 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep, case VHOST_VDPA_RESUME: r = vhost_vdpa_resume(v); break; + case VHOST_VDPA_BIND_IOMMUFD: + r = vhost_vdpa_bind_iommufd(v, argp); + break; + case VHOST_VDPA_UNBIND_IOMMUFD: + vhost_vdpa_unbind_iommufd(v); + break; + case VHOST_VDPA_ATTACH_IOMMUFD_PT: + r = vhost_vdpa_attach_iommufd_pt(v, argp); + break; + case VHOST_VDPA_DETACH_IOMMUFD_PT: + vhost_vdpa_detach_iommufd_pt(v); + break; #ifdef CONFIG_VHOST_VDPA_MIGRATION case VHOST_GET_DEV_BUFFER_SIZE: r = vhost_vdpa_get_dev_buffer_size(v, argp); @@ -1556,6 +1656,8 @@ static int vhost_vdpa_release(struct inode *inode, struct file *filep) struct vhost_vdpa *v = filep->private_data; struct vhost_dev *d = &v->vdev; + vhost_vdpa_unbind_iommufd(v); + mutex_lock(&d->mutex); filep->private_data = NULL; vhost_vdpa_clean_irq(v); @@ -1709,6 +1811,9 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) for (i = 0; i < VHOST_VDPA_IOTLB_BUCKETS; i++) INIT_HLIST_HEAD(&v->as[i]); + v->iommufd_dev = NULL; + v->iommufd_attached = false; + return 0; err: diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h index a54098c7b0bc..898cde933168 100644 --- a/include/uapi/linux/vhost.h +++ b/include/uapi/linux/vhost.h @@ -223,6 +223,34 @@ */ #define VHOST_VDPA_RESUME _IO(VHOST_VIRTIO, 0x7E) +/* Bind a vDPA device to the specified iommufd + * + * After the return of this ioctl the vDPA device is binded to the specified + * iommufd, and the device id is also returned. + */ +#define VHOST_VDPA_BIND_IOMMUFD _IO(VHOST_VIRTIO, 0x90) + +/* Unbind a vDPA device from the specified iommufd + * + * After the return of this ioctl the vDPA device is unbinded from the specified + * iommufd. + */ +#define VHOST_VDPA_UNBIND_IOMMUFD _IO(VHOST_VIRTIO, 0x91) + +/* Associate the vDPA device with an address space within the bound iommufd. + * + * After the return of this ioctl the vDPA device is attached to the bound + * iommufd. + */ +#define VHOST_VDPA_ATTACH_IOMMUFD_PT _IO(VHOST_VIRTIO, 0x92) + +/* Detach the vDPA device from an address space within the bound iommufd. + * + * After the return of this ioctl the vDPA device is detached from the address + * space within the bound iommufd. + */ +#define VHOST_VDPA_DETACH_IOMMUFD_PT _IO(VHOST_VIRTIO, 0x93) + /* set and get device buffer */ #define VHOST_GET_DEV_BUFFER _IOR(VHOST_VIRTIO, 0xb0, struct vhost_vdpa_config) #define VHOST_SET_DEV_BUFFER _IOW(VHOST_VIRTIO, 0xb1, struct vhost_vdpa_config) diff --git a/include/uapi/linux/vhost_types.h b/include/uapi/linux/vhost_types.h index c7f25b0f7645..450214d2ada5 100644 --- a/include/uapi/linux/vhost_types.h +++ b/include/uapi/linux/vhost_types.h @@ -163,6 +163,11 @@ struct vhost_vdpa_iova_range { __u64 last; }; +struct vhost_vdpa_bind_iommufd { + __s32 iommufd; + __u32 out_devid; +}; + /* vhost vdpa device migration statue */ enum { VHOST_VDPA_DEVICE_START, diff --git a/tools/include/uapi/linux/vhost.h b/tools/include/uapi/linux/vhost.h index f5c48b61ab62..679c7b137f75 100644 --- a/tools/include/uapi/linux/vhost.h +++ b/tools/include/uapi/linux/vhost.h @@ -219,4 +219,32 @@ */ #define VHOST_VDPA_RESUME _IO(VHOST_VIRTIO, 0x7E) +/* Bind a vDPA device to the specified iommufd + * + * After the return of this ioctl the vDPA device is binded to the specified + * iommufd, and the device id is also returned. + */ +#define VHOST_VDPA_BIND_IOMMUFD _IO(VHOST_VIRTIO, 0x90) + +/* Unbind a vDPA device from the specified iommufd + * + * After the return of this ioctl the vDPA device is unbinded from the specified + * iommufd. + */ +#define VHOST_VDPA_UNBIND_IOMMUFD _IO(VHOST_VIRTIO, 0x91) + +/* Associate the vDPA device with an address space within the bound iommufd. + * + * After the return of this ioctl the vDPA device is attached to the bound + * iommufd. + */ +#define VHOST_VDPA_ATTACH_IOMMUFD_PT _IO(VHOST_VIRTIO, 0x92) + +/* Detach the vDPA device from an address space within the bound iommufd. + * + * After the return of this ioctl the vDPA device is detached from the address + * space within the bound iommufd. + */ +#define VHOST_VDPA_DETACH_IOMMUFD_PT _IO(VHOST_VIRTIO, 0x93) + #endif -- 2.25.1

2 2

[PATCH openEuler-1.0-LTS] nfc: nci: add flush_workqueue to prevent uaf
by Ye Bin 31 Mar '25

31 Mar '25

From: Lin Ma <linma(a)zju.edu.cn> stable inclusion from stable-v4.19.239 commit 1a1748d0dd0f0a98535c6baeef671c8722107639 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP1G8 CVE: CVE-2022-49059 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit ef27324e2cb7bb24542d6cb2571740eefe6b00dc ] Our detector found a concurrent use-after-free bug when detaching an NCI device. The main reason for this bug is the unexpected scheduling between the used delayed mechanism (timer and workqueue). The race can be demonstrated below: Thread-1 Thread-2 | nci_dev_up() | nci_open_device() | __nci_request(nci_reset_req) | nci_send_cmd | queue_work(cmd_work) nci_unregister_device() | nci_close_device() | ... del_timer_sync(cmd_timer)[1] | ... | Worker nci_free_device() | nci_cmd_work() kfree(ndev)[3] | mod_timer(cmd_timer)[2] In short, the cleanup routine thought that the cmd_timer has already been detached by [1] but the mod_timer can re-attach the timer [2], even it is already released [3], resulting in UAF. This UAF is easy to trigger, crash trace by POC is like below [ 66.703713] ================================================================== [ 66.703974] BUG: KASAN: use-after-free in enqueue_timer+0x448/0x490 [ 66.703974] Write of size 8 at addr ffff888009fb7058 by task kworker/u4:1/33 [ 66.703974] [ 66.703974] CPU: 1 PID: 33 Comm: kworker/u4:1 Not tainted 5.18.0-rc2 #5 [ 66.703974] Workqueue: nfc2_nci_cmd_wq nci_cmd_work [ 66.703974] Call Trace: [ 66.703974] <TASK> [ 66.703974] dump_stack_lvl+0x57/0x7d [ 66.703974] print_report.cold+0x5e/0x5db [ 66.703974] ? enqueue_timer+0x448/0x490 [ 66.703974] kasan_report+0xbe/0x1c0 [ 66.703974] ? enqueue_timer+0x448/0x490 [ 66.703974] enqueue_timer+0x448/0x490 [ 66.703974] __mod_timer+0x5e6/0xb80 [ 66.703974] ? mark_held_locks+0x9e/0xe0 [ 66.703974] ? try_to_del_timer_sync+0xf0/0xf0 [ 66.703974] ? lockdep_hardirqs_on_prepare+0x17b/0x410 [ 66.703974] ? queue_work_on+0x61/0x80 [ 66.703974] ? lockdep_hardirqs_on+0xbf/0x130 [ 66.703974] process_one_work+0x8bb/0x1510 [ 66.703974] ? lockdep_hardirqs_on_prepare+0x410/0x410 [ 66.703974] ? pwq_dec_nr_in_flight+0x230/0x230 [ 66.703974] ? rwlock_bug.part.0+0x90/0x90 [ 66.703974] ? _raw_spin_lock_irq+0x41/0x50 [ 66.703974] worker_thread+0x575/0x1190 [ 66.703974] ? process_one_work+0x1510/0x1510 [ 66.703974] kthread+0x2a0/0x340 [ 66.703974] ? kthread_complete_and_exit+0x20/0x20 [ 66.703974] ret_from_fork+0x22/0x30 [ 66.703974] </TASK> [ 66.703974] [ 66.703974] Allocated by task 267: [ 66.703974] kasan_save_stack+0x1e/0x40 [ 66.703974] __kasan_kmalloc+0x81/0xa0 [ 66.703974] nci_allocate_device+0xd3/0x390 [ 66.703974] nfcmrvl_nci_register_dev+0x183/0x2c0 [ 66.703974] nfcmrvl_nci_uart_open+0xf2/0x1dd [ 66.703974] nci_uart_tty_ioctl+0x2c3/0x4a0 [ 66.703974] tty_ioctl+0x764/0x1310 [ 66.703974] __x64_sys_ioctl+0x122/0x190 [ 66.703974] do_syscall_64+0x3b/0x90 [ 66.703974] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 66.703974] [ 66.703974] Freed by task 406: [ 66.703974] kasan_save_stack+0x1e/0x40 [ 66.703974] kasan_set_track+0x21/0x30 [ 66.703974] kasan_set_free_info+0x20/0x30 [ 66.703974] __kasan_slab_free+0x108/0x170 [ 66.703974] kfree+0xb0/0x330 [ 66.703974] nfcmrvl_nci_unregister_dev+0x90/0xd0 [ 66.703974] nci_uart_tty_close+0xdf/0x180 [ 66.703974] tty_ldisc_kill+0x73/0x110 [ 66.703974] tty_ldisc_hangup+0x281/0x5b0 [ 66.703974] __tty_hangup.part.0+0x431/0x890 [ 66.703974] tty_release+0x3a8/0xc80 [ 66.703974] __fput+0x1f0/0x8c0 [ 66.703974] task_work_run+0xc9/0x170 [ 66.703974] exit_to_user_mode_prepare+0x194/0x1a0 [ 66.703974] syscall_exit_to_user_mode+0x19/0x50 [ 66.703974] do_syscall_64+0x48/0x90 [ 66.703974] entry_SYSCALL_64_after_hwframe+0x44/0xae To fix the UAF, this patch adds flush_workqueue() to ensure the nci_cmd_work is finished before the following del_timer_sync. This combination will promise the timer is actually detached. Fixes: 6a2968aaf50c ("NFC: basic NCI protocol implementation") Signed-off-by: Lin Ma <linma(a)zju.edu.cn> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Ye Bin <yebin10(a)huawei.com> --- net/nfc/nci/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index e6f1530f64f9..dad961aaeb83 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -560,6 +560,10 @@ static int nci_close_device(struct nci_dev *ndev) mutex_lock(&ndev->req_lock); if (!test_and_clear_bit(NCI_UP, &ndev->flags)) { + /* Need to flush the cmd wq in case + * there is a queued/running cmd_work + */ + flush_workqueue(ndev->cmd_wq); del_timer_sync(&ndev->cmd_timer); del_timer_sync(&ndev->data_timer); mutex_unlock(&ndev->req_lock); -- 2.34.1

2 1

[openeuler:OLK-5.10 2829/2829] drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6057:62: sparse: sparse: incorrect type in argument 4 (different base types)
by kernel test robot 31 Mar '25

31 Mar '25

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: 2d7a642a3b89c993676c887941944d0f932d2052 commit: abd5078bcd21063944ed133282ee3fafdc92092c [2829/2829] net: wangxun: fix resolving ipv6 pakets extension header errors config: x86_64-randconfig-122-20250330 (https://download.01.org/0day-ci/archive/20250331/202503311730.Gkig2fxG-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250331/202503311730.Gkig2fxG-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202503311730.Gkig2fxG-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) drivers/net/ethernet/netswift/txgbe/txgbe_main.c:177:6: sparse: sparse: symbol 'txgbe_service_event_schedule' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:940:40: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected restricted __be16 [usertype] vlan_proto @@ got unsigned short [usertype] @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:940:40: sparse: expected restricted __be16 [usertype] vlan_proto drivers/net/ethernet/netswift/txgbe/txgbe_main.c:940:40: sparse: got unsigned short [usertype] drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2647:6: sparse: sparse: symbol 'txgbe_disable_tx_queue' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2792:25: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2792:25: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2792:25: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2796:25: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2796:25: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2796:25: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2807:25: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2807:25: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2807:25: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2811:25: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2811:25: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2811:25: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2873:17: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2873:17: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2873:17: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2928:9: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2928:9: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:2928:9: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3336:5: sparse: sparse: symbol 'txgbe_add_cloud_switcher' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3351:5: sparse: sparse: symbol 'txgbe_del_cloud_switcher' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3671:9: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3671:9: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3671:9: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3701:6: sparse: sparse: symbol 'txgbe_configure_isb' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3715:6: sparse: sparse: symbol 'txgbe_configure_port' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3964:9: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3964:9: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:3964:9: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4291:9: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4291:9: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4291:9: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4368:17: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4368:17: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4368:17: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4386:5: sparse: sparse: symbol 'txgbe_init_shared_code' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4476:9: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4476:9: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4476:9: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4905:17: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4905:17: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:4905:17: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:5037:17: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:5037:17: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:5037:17: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6047:40: sparse: sparse: restricted __be16 degrades to integer >> drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6057:62: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected restricted __be16 [usertype] *frag_offp @@ got unsigned short * @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6057:62: sparse: expected restricted __be16 [usertype] *frag_offp drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6057:62: sparse: got unsigned short * drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6075:36: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6079:67: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6089:32: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6090:36: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6094:67: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6108:37: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6119:61: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected restricted __be16 [usertype] *frag_offp @@ got unsigned short * @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6119:61: sparse: expected restricted __be16 [usertype] *frag_offp drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6119:61: sparse: got unsigned short * drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6136:40: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6148:61: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected restricted __be16 [usertype] *frag_offp @@ got unsigned short * @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6148:61: sparse: expected restricted __be16 [usertype] *frag_offp drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6148:61: sparse: got unsigned short * drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6292:62: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected restricted __be16 [usertype] *frag_offp @@ got unsigned short * @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6292:62: sparse: expected restricted __be16 [usertype] *frag_offp drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6292:62: sparse: got unsigned short * drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6388:70: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected restricted __be16 [usertype] *frag_offp @@ got unsigned short * @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6388:70: sparse: expected restricted __be16 [usertype] *frag_offp drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6388:70: sparse: got unsigned short * drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6448:61: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected restricted __be16 [usertype] *frag_offp @@ got unsigned short * @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6448:61: sparse: expected restricted __be16 [usertype] *frag_offp drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6448:61: sparse: got unsigned short * drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6774:33: sparse: sparse: invalid assignment: ^= drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6774:33: sparse: left side has type unsigned short drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6774:33: sparse: right side has type restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6776:33: sparse: sparse: invalid assignment: ^= drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6776:33: sparse: left side has type unsigned short drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6776:33: sparse: right side has type restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6778:38: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6779:25: sparse: sparse: invalid assignment: ^= drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6779:25: sparse: left side has type unsigned short drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6779:25: sparse: right side has type restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6783:27: sparse: sparse: invalid assignment: ^= drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6783:27: sparse: left side has type unsigned int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6783:27: sparse: right side has type restricted __be32 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6793:27: sparse: sparse: invalid assignment: ^= drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6793:27: sparse: left side has type unsigned int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6793:27: sparse: right side has type restricted __be32 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6813:5: sparse: sparse: symbol 'txgbe_skb_pad_nonzero' was not declared. Should it be static? drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6855:30: sparse: sparse: incorrect type in initializer (different base types) @@ expected unsigned short [usertype] protocol @@ got restricted __be16 [usertype] protocol @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6855:30: sparse: expected unsigned short [usertype] protocol drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6855:30: sparse: got restricted __be16 [usertype] protocol drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6902:26: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] protocol @@ got restricted __be16 [usertype] h_vlan_encapsulated_proto @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6902:26: sparse: expected unsigned short [usertype] protocol drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6902:26: sparse: got restricted __be16 [usertype] h_vlan_encapsulated_proto drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6903:29: sparse: sparse: cast from restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6915:26: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] protocol @@ got restricted __be16 [usertype] h_vlan_encapsulated_proto @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6915:26: sparse: expected unsigned short [usertype] protocol drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6915:26: sparse: got restricted __be16 [usertype] h_vlan_encapsulated_proto drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6948:42: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __be16 [usertype] h_vlan_TCI @@ got unsigned short [usertype] @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6948:42: sparse: expected restricted __be16 [usertype] h_vlan_TCI drivers/net/ethernet/netswift/txgbe/txgbe_main.c:6948:42: sparse: got unsigned short [usertype] drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7327:23: sparse: sparse: cast from restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7393:46: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7395:37: sparse: sparse: cast from restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7403:47: sparse: sparse: restricted __be16 degrades to integer drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7405:37: sparse: sparse: cast from restricted __be16 drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7497:26: sparse: sparse: incorrect type in initializer (different base types) @@ expected unsigned short [usertype] type @@ got restricted __be16 [usertype] protocol @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7497:26: sparse: expected unsigned short [usertype] type drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7497:26: sparse: got restricted __be16 [usertype] protocol drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7513:22: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] type @@ got restricted __be16 [usertype] h_vlan_encapsulated_proto @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7513:22: sparse: expected unsigned short [usertype] type drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7513:22: sparse: got restricted __be16 [usertype] h_vlan_encapsulated_proto drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7540:35: sparse: sparse: incorrect type in initializer (incompatible argument 2 (different base types)) @@ expected int ( *ndo_vlan_rx_add_vid )( ... ) @@ got int ( * )( ... ) @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7540:35: sparse: expected int ( *ndo_vlan_rx_add_vid )( ... ) drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7540:35: sparse: got int ( * )( ... ) drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7541:35: sparse: sparse: incorrect type in initializer (incompatible argument 2 (different base types)) @@ expected int ( *ndo_vlan_rx_kill_vid )( ... ) @@ got int ( * )( ... ) @@ drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7541:35: sparse: expected int ( *ndo_vlan_rx_kill_vid )( ... ) drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7541:35: sparse: got int ( * )( ... ) drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7698:9: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7698:9: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7698:9: sparse: int drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7901:17: sparse: sparse: incompatible types in conditional expression (different base types): drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7901:17: sparse: void drivers/net/ethernet/netswift/txgbe/txgbe_main.c:7901:17: sparse: int vim +6057 drivers/net/ethernet/netswift/txgbe/txgbe_main.c 6030 6031 static txgbe_dptype encode_tx_desc_ptype(const struct txgbe_tx_buffer *first) 6032 { 6033 struct sk_buff *skb = first->skb; 6034 u8 tun_prot = 0; 6035 u8 l4_prot = 0; 6036 u8 ptype = 0; 6037 unsigned char *exthdr; 6038 unsigned char *l4_hdr; 6039 __be16 frag_off; 6040 6041 if (skb->encapsulation) { 6042 union network_header hdr; 6043 6044 switch (first->protocol) { 6045 case __constant_htons(ETH_P_IP): 6046 tun_prot = ip_hdr(skb)->protocol; 6047 if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) 6048 goto encap_frag; 6049 ptype = TXGBE_PTYPE_TUN_IPV4; 6050 break; 6051 case __constant_htons(ETH_P_IPV6): 6052 l4_hdr = skb_transport_header(skb); 6053 exthdr = skb_network_header(skb) + sizeof(struct ipv6hdr); 6054 tun_prot = ipv6_hdr(skb)->nexthdr; 6055 if (l4_hdr != exthdr) 6056 ipv6_skip_exthdr(skb, exthdr - skb->data, > 6057 &tun_prot, &frag_off); 6058 if (tun_prot == NEXTHDR_FRAGMENT) 6059 goto encap_frag; 6060 ptype = TXGBE_PTYPE_TUN_IPV6; 6061 break; 6062 default: 6063 goto exit; 6064 } 6065 6066 if (tun_prot == IPPROTO_IPIP || 6067 tun_prot == IPPROTO_IPV6) { 6068 hdr.raw = (void *)inner_ip_hdr(skb); 6069 ptype |= TXGBE_PTYPE_PKT_IPIP; 6070 } else if (tun_prot == IPPROTO_UDP) { 6071 hdr.raw = (void *)inner_ip_hdr(skb); 6072 /* fixme: VXLAN-GPE neither ETHER nor IP */ 6073 6074 if (skb->inner_protocol_type != ENCAP_TYPE_ETHER || 6075 skb->inner_protocol != htons(ETH_P_TEB)) { 6076 ptype |= TXGBE_PTYPE_PKT_IG; 6077 } else { 6078 if (((struct ethhdr *) 6079 skb_inner_mac_header(skb))->h_proto 6080 == htons(ETH_P_8021Q)) { 6081 ptype |= TXGBE_PTYPE_PKT_IGMV; 6082 } else { 6083 ptype |= TXGBE_PTYPE_PKT_IGM; 6084 } 6085 } 6086 6087 } else if (tun_prot == IPPROTO_GRE) { 6088 hdr.raw = (void *)inner_ip_hdr(skb); 6089 if (skb->inner_protocol == htons(ETH_P_IP) || 6090 skb->inner_protocol == htons(ETH_P_IPV6)) { 6091 ptype |= TXGBE_PTYPE_PKT_IG; 6092 } else { 6093 if (((struct ethhdr *) 6094 skb_inner_mac_header(skb))->h_proto 6095 == htons(ETH_P_8021Q)) { 6096 ptype |= TXGBE_PTYPE_PKT_IGMV; 6097 } else { 6098 ptype |= TXGBE_PTYPE_PKT_IGM; 6099 } 6100 } 6101 } else { 6102 goto exit; 6103 } 6104 6105 switch (hdr.ipv4->version) { 6106 case IPVERSION: 6107 l4_prot = hdr.ipv4->protocol; 6108 if (hdr.ipv4->frag_off & htons(IP_MF | IP_OFFSET)) { 6109 ptype |= TXGBE_PTYPE_TYP_IPFRAG; 6110 goto exit; 6111 } 6112 break; 6113 case 6: 6114 l4_hdr = skb_inner_transport_header(skb); 6115 exthdr = skb_inner_network_header(skb) + sizeof(struct ipv6hdr); 6116 l4_prot = inner_ipv6_hdr(skb)->nexthdr; 6117 if (l4_hdr != exthdr) 6118 ipv6_skip_exthdr(skb, exthdr - skb->data, 6119 &l4_prot, &frag_off); 6120 ptype |= TXGBE_PTYPE_PKT_IPV6; 6121 if (l4_prot == NEXTHDR_FRAGMENT) { 6122 ptype |= TXGBE_PTYPE_TYP_IPFRAG; 6123 goto exit; 6124 } 6125 break; 6126 default: 6127 goto exit; 6128 } 6129 } else { 6130 encap_frag: 6131 6132 switch (first->protocol) { 6133 case __constant_htons(ETH_P_IP): 6134 l4_prot = ip_hdr(skb)->protocol; 6135 ptype = TXGBE_PTYPE_PKT_IP; 6136 if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) { 6137 ptype |= TXGBE_PTYPE_TYP_IPFRAG; 6138 goto exit; 6139 } 6140 break; 6141 #ifdef NETIF_F_IPV6_CSUM 6142 case __constant_htons(ETH_P_IPV6): 6143 l4_hdr = skb_transport_header(skb); 6144 exthdr = skb_network_header(skb) + sizeof(struct ipv6hdr); 6145 l4_prot = ipv6_hdr(skb)->nexthdr; 6146 if (l4_hdr != exthdr) 6147 ipv6_skip_exthdr(skb, exthdr - skb->data, 6148 &l4_prot, &frag_off); 6149 6150 ptype = TXGBE_PTYPE_PKT_IP | TXGBE_PTYPE_PKT_IPV6; 6151 if (l4_prot == NEXTHDR_FRAGMENT) { 6152 ptype |= TXGBE_PTYPE_TYP_IPFRAG; 6153 goto exit; 6154 } 6155 break; 6156 #endif /* NETIF_F_IPV6_CSUM */ 6157 case __constant_htons(ETH_P_1588): 6158 ptype = TXGBE_PTYPE_L2_TS; 6159 goto exit; 6160 case __constant_htons(ETH_P_FIP): 6161 ptype = TXGBE_PTYPE_L2_FIP; 6162 goto exit; 6163 case __constant_htons(TXGBE_ETH_P_LLDP): 6164 ptype = TXGBE_PTYPE_L2_LLDP; 6165 goto exit; 6166 case __constant_htons(TXGBE_ETH_P_CNM): 6167 ptype = TXGBE_PTYPE_L2_CNM; 6168 goto exit; 6169 case __constant_htons(ETH_P_PAE): 6170 ptype = TXGBE_PTYPE_L2_EAPOL; 6171 goto exit; 6172 case __constant_htons(ETH_P_ARP): 6173 ptype = TXGBE_PTYPE_L2_ARP; 6174 goto exit; 6175 default: 6176 ptype = TXGBE_PTYPE_L2_MAC; 6177 goto exit; 6178 } 6179 6180 } 6181 6182 switch (l4_prot) { 6183 case IPPROTO_TCP: 6184 ptype |= TXGBE_PTYPE_TYP_TCP; 6185 break; 6186 case IPPROTO_UDP: 6187 ptype |= TXGBE_PTYPE_TYP_UDP; 6188 break; 6189 case IPPROTO_SCTP: 6190 ptype |= TXGBE_PTYPE_TYP_SCTP; 6191 break; 6192 default: 6193 ptype |= TXGBE_PTYPE_TYP_IP; 6194 break; 6195 } 6196 6197 exit: 6198 return txgbe_decode_ptype(ptype); 6199 } 6200 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10] media: uvcvideo: Fix double free in error path
by Gu Bowen 31 Mar '25

31 Mar '25

From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> stable inclusion from stable-v6.6.76 commit 6c36dcd662ec5276782838660f8533a7cb26be49 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBPBDI CVE: CVE-2024-57980 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit c6ef3a7fa97ec823a1e1af9085cf13db9f7b3bac upstream. If the uvc_status_init() function fails to allocate the int_urb, it will free the dev->status pointer but doesn't reset the pointer to NULL. This results in the kfree() call in uvc_status_cleanup() trying to double-free the memory. Fix it by resetting the dev->status pointer to NULL after freeing it. Fixes: a31a4055473b ("V4L/DVB:usbvideo:don't use part of buffer for USB transfer #4") Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20241107235130.31372-1-laurent.pinchart@ideasonbo… Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Reviewed by: Ricardo Ribalda <ribalda(a)chromium.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: drivers/media/usb/uvc/uvc_status.c [Context conflicts due to commit adfd3910c27fb ("media: uvcvideo: Remove void casting for the status endpoint") not merge.] Signed-off-by: Gu Bowen <gubowen5(a)huawei.com> --- drivers/media/usb/uvc/uvc_status.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index 73725051cc16..6edf491dd873 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -269,6 +269,7 @@ int uvc_status_init(struct uvc_device *dev) dev->int_urb = usb_alloc_urb(0, GFP_KERNEL); if (dev->int_urb == NULL) { kfree(dev->status); + dev->status = NULL; return -ENOMEM; } -- 2.25.1

2 1