合并受阻
openeuler-ci-botWelcome To openEuler Community
Hey @liyi15 , thanks for your contribution to the community.
Bot Usage Manual
I'm the Bot here serving you. You can find the instructions on how to interact with me at Here . That means you can comment below every pull request or issue to trigger Bot Commands.
Contact Guide
If you have any questions, please contact the SIG: Desktop ,
and any of the maintainers: @dou33, @dwl301, @lostway1, @openbot, @small_leek, @t_feng, @wangxp006, @weidongkl, @yanan-rock ,
and any of the committers: @dou33, @dwl301, @zhang__3125 .
当前仓库存在以下 保护分支 ：
| Protected Branch | Version | Release |
|---|---|---|
| master | 1.20.11 | 44 |
| openEuler-24.03-LTS-SP2 | 1.20.11 | 43 |
| openEuler-24.03-LTS-SP1 | 1.20.11 | 43 |
| openEuler-24.03-LTS-Next | 1.20.11 | 43 |
| openEuler-24.03-LTS | 1.20.11 | 43 |
| openEuler-20.03-LTS-SP4 | 1.20.8 | 36 |
| openEuler-24.03-LTS-SP3 | 1.20.11 | 43 |
| openEuler-22.03-LTS-SP4 | 1.20.11 | 42 |
| openEuler-25.09 | 1.20.11 | 41 |
| openEuler-25.03 | 1.20.11 | 40 |
| openEuler1.0-base | 1.20.6 | 2 |
| openEuler1.0 | 1.20.6 | 2 |
评论 /sync <branch1> <branch2> ... 可将当前 PR 修改同步到其它分支（创建同步 PR）：
a) 如果当前 PR 是 Open 状态，同步操作将延迟到 PR 被合并时执行
b) 如果当前 PR 已经 Merged，将立即执行同步操作
注意：
- /sync 命令可以指定同步到多个分支，仅最后一个 /sync 命令生效
- 如果创建的同步 PR 不正确，可通过向同步 PR 的源分支提交轻量级 PR 完善，或使用 /close 命令关闭
门禁正在运行， 您可以通过以下链接查看实时门禁检查结果.
若您对门禁结果含义不清晰或者遇到问题不知如何解决，可参考门禁指导手册
门禁入口及编码规范检查: multiarch/src-openeuler/trigger/xorg-x11-server/22/console
aarch64架构构建及构建后检查：multiarch/src-openeuler/aarch64/xorg-x11-server/22/console
x86_64架构构建及构建后检查：multiarch/src-openeuler/x86-64/xorg-x11-server/22/console
| Check Name | Build Result | Build Details | |
|---|---|---|---|
| check_binary_file | ✅SUCCESS | #22 | |
| check_package_yaml_file | ✅SUCCESS | ||
| check_repo_in_maintain | ✅SUCCESS | ||
| check_consistency | ✅SUCCESS | ||
| check_spec_file | ✅SUCCESS | ||
| x86_64 | check_build | ✅SUCCESS | #22 |
| check_install | ✅SUCCESS | ||
| check_license | ✅SUCCESS | ||
| aarch64 | check_build | ✅SUCCESS | #22 |
| check_install | ✅SUCCESS | ||
| check_license | ✅SUCCESS | ||
如下为接口变更检查结果，目标分支为openEuler-24.03-LTS-SP3，请PR提交者check差异信息
| Arch Name | Check Items | Rpm Name | Check Result | Build Details |
|---|---|---|---|---|
| compare_package(x86_64) | add_rpms | ✅SUCCESS | #22 | |
| delete_rpms | ✅SUCCESS | |||
| rpm_abi | ✅SUCCESS | |||
| rpm_cmd | ✅SUCCESS | |||
| rpm_files | ✅SUCCESS | |||
| rpm_header | xorg-x11-server-source | ❌FAILED | ||
| rpm_lib | ✅SUCCESS | |||
| rpm_provides | ✅SUCCESS | |||
| rpm_requires | ✅SUCCESS | |||
| rpm_symbol | ✅SUCCESS | |||
| compare_package(aarch64) | add_rpms | ✅SUCCESS | #22 | |
| delete_rpms | ✅SUCCESS | |||
| rpm_abi | ✅SUCCESS | |||
| rpm_cmd | ✅SUCCESS | |||
| rpm_files | ✅SUCCESS | |||
| rpm_header | xorg-x11-server-source | ❌FAILED | ||
| rpm_lib | ✅SUCCESS | |||
| rpm_provides | ✅SUCCESS | |||
| rpm_requires | ✅SUCCESS | |||
| rpm_symbol | ✅SUCCESS |
@liyi15
这个PR是自研补丁用于修复CVE-2023-5574上游社区修复补丁引发的回归问题吗？
我注意到CVE-2023-5574上游社区PR https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1189 最终未合入主线。
另外我在测试时发现xorg-x11-server使用qxl驱动，CVE-2023-5574修复补丁会造成空指针解引用导致进程崩溃，且当前PR补丁也未修复这一问题。
请尝试回退CVE-2023-5574的3个补丁并告知我们是否解决了你的问题，谢谢。
Fix shm close order for CVE-2023-5574