Fix pam SIGSEGV. (#280)

Signed-off-by: RileyW <[email protected]>
PKUHPC · Jun 18, 2024 · 63a3024 · 63a3024
1 parent 4af06fd
commit 63a3024
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Craned/CgroupManager.cpp b/src/Craned/CgroupManager.cpp
@@ -428,7 +428,7 @@ bool CgroupManager::QueryTaskInfoOfUidAsync(uid_t uid, TaskInfoOfUid *info) {
 bool CgroupManager::MigrateProcToCgroupOfTask(pid_t pid, task_id_t task_id) {
   Cgroup *cg;
   bool ok = AllocateAndGetCgroup(task_id, &cg);
-  if (cg == nullptr) return false;
+  if (!ok) return false;
 
   return cg->MigrateProcIn(pid);
 }

diff --git a/src/Misc/Pam/Pam.cpp b/src/Misc/Pam/Pam.cpp
@@ -152,8 +152,10 @@ extern "C" {
     ok = GrpcMigrateSshProcToCgroup(pamh, getpid(), task_id);
     if (ok)
       return PAM_SUCCESS;
-    else
+    else {
+      PamSendMsgToClient(pamh, "Rejected by CraneD PAM Module.");
       return PAM_SESSION_ERR;
+    }
   } else {
     // If auth result is false, it indicates that system administrator allow a
     // user with no task running to log in, and then we just let it pass.