diff options
Diffstat (limited to 'meta/recipes-extended/sudo/files/crypt.patch')
-rw-r--r-- | meta/recipes-extended/sudo/files/crypt.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-extended/sudo/files/crypt.patch b/meta/recipes-extended/sudo/files/crypt.patch new file mode 100644 index 0000000000..53a257f52c --- /dev/null +++ b/meta/recipes-extended/sudo/files/crypt.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Staring from glibc 2.17 the crypt() function will error out and return NULL if | ||
2 | the seed or "correct" is invalid. The failure case for this is the sudo user | ||
3 | having a locked account in /etc/shadow, so their password is "!", which is an | ||
4 | invalid hash. crypt() never returned NULL previously so this is crashing in | ||
5 | strcmp(). | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
9 | |||
10 | Index: sudo-1.8.6p7/plugins/sudoers/auth/passwd.c | ||
11 | =================================================================== | ||
12 | --- sudo-1.8.6p7.orig/plugins/sudoers/auth/passwd.c 2013-04-11 15:26:28.456416867 +0100 | ||
13 | +++ sudo-1.8.6p7/plugins/sudoers/auth/passwd.c 2013-04-11 15:31:31.156421718 +0100 | ||
14 | @@ -96,7 +96,9 @@ | ||
15 | */ | ||
16 | epass = (char *) crypt(pass, pw_epasswd); | ||
17 | pass[8] = sav; | ||
18 | - if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) | ||
19 | + if (epass == NULL) | ||
20 | + error = AUTH_FAILURE; | ||
21 | + else if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) | ||
22 | error = strncmp(pw_epasswd, epass, DESLEN); | ||
23 | else | ||
24 | error = strcmp(pw_epasswd, epass); | ||