Fix SVACE defects: unsafe functions and dead code

Change-Id: I1f670628bc6636e89ca9a7d9eae72922f062fd22
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

1 files changed, 22 insertions, 8 deletions

diff --git a/src/pam_plugin/pam-key-manager-plugin.cpp b/src/pam_plugin/pam-key-manager-plugin.cpp
index 74a1d252..8b401b27 100644
--- a/src/pam_plugin/pam-key-manager-plugin.cpp
+++ b/src/pam_plugin/pam-key-manager-plugin.cpp
@@ -48,23 +48,37 @@ bool identify_user_pwd(pam_handle_t *pamh, uid_t &uid, std::string &passwd)
 	if ((pam_err = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS)
 		return true;
 
-	struct passwd *pwd;
+	struct passwd pwd;
+	struct passwd *result = nullptr;
+	int bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
 
-	if ((pwd = getpwnam(user)) == NULL)
+	if (bufsize <= 0)
+		bufsize = 16384; /* should be more than enough */
+
+	memset(&pwd, 0x00, sizeof(pwd));
+	std::vector<char> buf(bufsize, 0);
+
+	int ret = getpwnam_r(user, &pwd, buf.data(), bufsize, &result);
+	if (ret != 0 || result == nullptr)
 		return true;
 
-	if (strcmp(pwd->pw_passwd, PASSWORD_SHADOWED) == 0) {
-		struct spwd *pwd_sh;
+	if (strcmp(pwd.pw_passwd, PASSWORD_SHADOWED) == 0) {
+		struct spwd pwd_sh;
+		struct spwd *result_sh = nullptr;
+
+		memset(&pwd_sh, 0x00, sizeof(pwd_sh));
+		std::vector<char> buf_sh(bufsize, 0);
 
-		if ((pwd_sh = getspnam(user)) == NULL)
+		ret = getspnam_r(user, &pwd_sh, buf_sh.data(), bufsize, &result_sh);
+		if (ret != 0 || result_sh == nullptr)
 			return true;
 
-		passwd = std::string(pwd_sh->sp_pwdp);
+		passwd = std::string(pwd_sh.sp_pwdp);
 	} else {
-		passwd = std::string(pwd->pw_passwd);
+		passwd = std::string(pwd.pw_passwd);
 	}
 
-	uid = pwd->pw_uid;
+	uid = pwd.pw_uid;
 	return false;
 }
 }