From: Christof Schmitt <cs@samba.org>
Date: Thu, 9 Jul 2020 03:03:44 +0000 (-0700)
Subject: pam_winbind: Fix CID 242274 Time of check time of use
X-Git-Tag: talloc-2.3.2~1077
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd364b01e2defb5f48238db64d3ef7f6d828c517;p=thirdparty%2Fsamba.git

pam_winbind: Fix CID 242274 Time of check time of use

Always issue the mkdir call to avoid the TOCTOU issue. Only if there is
already an object with the requested name, check whether it is a
directory.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 61ce4fd6b21..aee45bfe9bc 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1582,14 +1582,23 @@ static int _pam_create_homedir(struct pwb_context *ctx,
 			       const char *dirname,
 			       mode_t mode)
 {
-	struct stat sbuf;
+	int ret;
 
-	if (stat(dirname, &sbuf) == 0) {
-		return PAM_SUCCESS;
-	}
+	ret = mkdir(dirname, mode);
+	if (ret != 0 && errno == EEXIST) {
+		struct stat sbuf;
 
-	if (mkdir(dirname, mode) != 0) {
+		ret = stat(dirname, &sbuf);
+		if (ret != 0) {
+			return PAM_PERM_DENIED;
+		}
+
+		if (!S_ISDIR(sbuf.st_mode)) {
+			return PAM_PERM_DENIED;
+		}
+	}
 
+	if (ret != 0) {
 		_make_remark_format(ctx, PAM_TEXT_INFO,
 				    _("Creating directory: %s failed: %s"),
 				    dirname, strerror(errno));