Attachment 585827 Details for Bug 815617 – Fixed possible NULL pointer dereferencing

[patch] Fixed possible NULL pointer dereferencing

ppp-2.4.5-crypt.patch (text/plain), 1.79 KB, created by Michal Sekletar on 2012-05-21 14:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Sekletar

Created: 2012-05-21 14:34:17 UTC

Size: 1.79 KB

patch

obsolete

>diff -up ppp-2.4.5/pppd/auth.c.crypt ppp-2.4.5/pppd/auth.c
>--- ppp-2.4.5/pppd/auth.c.crypt	2012-05-21 16:12:41.422654902 +0200
>+++ ppp-2.4.5/pppd/auth.c	2012-05-21 16:13:44.819159821 +0200
>@@ -1514,12 +1514,19 @@ check_passwd(unit, auser, userlen, apass
> 		    ret = UPAP_AUTHNAK;
> 		}
> 	    }
>-	    if (secret[0] != 0 && !login_secret) {
>-		/* password given in pap-secrets - must match */
>-		if ((cryptpap || strcmp(passwd, secret) != 0)
>-		    && strcmp(crypt(passwd, secret), secret) != 0)
>-		    ret = UPAP_AUTHNAK;
>-	    }
>+		if (secret[0] != 0 && !login_secret) {
>+			/* password given in pap-secrets - must match */
>+			char *cryptbuf = NULL;
>+			cryptbuf = crypt(passwd, secret);
>+
>+			if (cryptpap) {
>+				if ((cryptbuf == NULL) || (strcmp(cryptbuf, secret) != 0)) 
>+					ret = UPAP_AUTHNAK;
>+			} else {
>+				if ((strcmp(passwd, secret) != 0) && (cryptbuf == NULL || strcmp(cryptbuf, secret) != 0)) 
>+					ret = UPAP_AUTHNAK;
>+			}
>+		}
> 	}
> 	fclose(f);
>     }
>diff -up ppp-2.4.5/pppd/session.c.crypt ppp-2.4.5/pppd/session.c
>--- ppp-2.4.5/pppd/session.c.crypt	2009-11-16 23:26:07.000000000 +0100
>+++ ppp-2.4.5/pppd/session.c	2012-05-21 16:12:41.458654620 +0200
>@@ -348,9 +348,14 @@ session_start(flags, user, passwd, ttyNa
> 	/*
> 	 * If no passwd, don't let them login if we're authenticating.
> 	 */
>-        if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2
>-            || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0)
>+        if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2) {
>             return SESSION_FAILED;
>+        } else {
>+            char *cryptbuf = NULL;
>+            cryptbuf = crypt(passwd, pw->pw_passwd);
>+            if ((cryptbuf == NULL) || (strcmp(cryptbuf, pw->pw_passwd) != 0))
>+                return SESSION_FAILED;
>+        }
>     }
> 
> #endif /* #ifdef USE_PAM */

Flags:

pwouters: review+
thozza: review+

Actions: View | Diff

Attachments on bug 815617: 579743 | 585827