fb85764afc
Signed-off-by: xuraoqing <xuraoqing@huawei.com> (cherry picked from commit c154fee26edd16d9df9f3125c987f760b80fcbd6)
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 0e25f0d19986d47c86c2e75ceaa3b66499a85ec9 Mon Sep 17 00:00:00 2001
|
|
From: answer9030 <jiangjixiang@kylinos.cn>
|
|
Date: Thu, 9 Mar 2023 14:47:37 +0800
|
|
Subject: [PATCH] Fixed pid wrapping in sss_cli_check_socket
|
|
|
|
Resolves: https://github.com/SSSD/sssd/issues/6592
|
|
|
|
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
|
|
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
|
|
Reference:https://github.com/SSSD/sssd/commit/0e25f0d19986d47c86c2e75ceaa3b66499a85ec9
|
|
Conflict:NA
|
|
|
|
---
|
|
src/sss_client/common.c | 19 +++++++++++++------
|
|
1 file changed, 13 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/sss_client/common.c b/src/sss_client/common.c
|
|
index c8ade645b..39b107527 100644
|
|
--- a/src/sss_client/common.c
|
|
+++ b/src/sss_client/common.c
|
|
@@ -684,21 +684,28 @@ static enum sss_status sss_cli_check_socket(int *errnop,
|
|
int timeout)
|
|
{
|
|
static pid_t mypid;
|
|
- struct stat mysb;
|
|
+ static struct stat selfsb;
|
|
+ struct stat mypid_sb, myself_sb;
|
|
int mysd;
|
|
int ret;
|
|
|
|
- if (getpid() != mypid) {
|
|
- ret = fstat(sss_cli_sd, &mysb);
|
|
+ ret = lstat("/proc/self/", &myself_sb);
|
|
+
|
|
+ if (getpid() != mypid || (ret == 0 && myself_sb.st_ino != selfsb.st_ino)) {
|
|
+ ret = fstat(sss_cli_sd, &mypid_sb);
|
|
if (ret == 0) {
|
|
- if (S_ISSOCK(mysb.st_mode) &&
|
|
- mysb.st_dev == sss_cli_sb.st_dev &&
|
|
- mysb.st_ino == sss_cli_sb.st_ino) {
|
|
+ if (S_ISSOCK(mypid_sb.st_mode) &&
|
|
+ mypid_sb.st_dev == sss_cli_sb.st_dev &&
|
|
+ mypid_sb.st_ino == sss_cli_sb.st_ino) {
|
|
sss_cli_close_socket();
|
|
}
|
|
}
|
|
sss_cli_sd = -1;
|
|
mypid = getpid();
|
|
+ ret = lstat("/proc/self/", &selfsb);
|
|
+ if (ret) {
|
|
+ memset(&selfsb, 0, sizeof(selfsb));
|
|
+ }
|
|
}
|
|
|
|
/* check if the socket has been closed on the other side */
|
|
--
|
|
2.33.0
|
|
|