Search
SailfishOS Open Build Service
>
Projects
>
home:kontio
:
nfs
>
krb5
> krb5-1.7.1-CVE-2011-0281,0282.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File krb5-1.7.1-CVE-2011-0281,0282.patch of Package krb5
--- krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h.orig 2009-01-31 07:55:14.000000000 +0800 +++ krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2011-04-15 15:54:18.000000000 +0800 @@ -101,15 +101,19 @@ extern void prepend_err_str (krb5_contex #define LDAP_SEARCH(base, scope, filter, attrs) LDAP_SEARCH_1(base, scope, filter, attrs, CHECK_STATUS) #define LDAP_SEARCH_1(base, scope, filter, attrs, status_check) \ - do { \ - st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, NULL, &timelimit, LDAP_NO_LIMIT, &result); \ - if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \ - tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \ - if (ldap_server_handle) \ - ld = ldap_server_handle->ldap_handle; \ - } \ - }while (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR && tempst == 0); \ - \ + tempst = 0; \ + st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, \ + NULL, &timelimit, LDAP_NO_LIMIT, &result); \ + if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \ + tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \ + if (ldap_server_handle) \ + ld = ldap_server_handle->ldap_handle; \ + if (tempst == 0) \ + st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, \ + NULL, NULL, &timelimit, \ + LDAP_NO_LIMIT, &result); \ + } \ + \ if (status_check != IGNORE_STATUS) { \ if (tempst != 0) { \ prepend_err_str(context, "LDAP handle unavailable: ", KRB5_KDB_ACCESS_ERROR, st); \ --- krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c.orig 2008-10-07 04:04:12.000000000 +0800 +++ krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c 2011-04-15 15:50:23.000000000 +0800 @@ -296,6 +296,7 @@ krb5_ldap_rebind(ldap_context, ldap_serv { krb5_ldap_server_handle *handle = *ldap_server_handle; + ldap_unbind_ext_s(handle->ldap_handle, NULL, NULL); if ((ldap_initialize(&handle->ldap_handle, handle->server_info->server_name) != LDAP_SUCCESS) || (krb5_ldap_bind(ldap_context, handle) != LDAP_SUCCESS)) return krb5_ldap_request_next_handle_from_pool(ldap_context, ldap_server_handle); --- krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c.orig 2009-02-19 02:14:48.000000000 +0800 +++ krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c 2011-04-15 15:56:27.000000000 +0800 @@ -449,12 +449,11 @@ is_principal_in_realm(ldap_context, sear * portion, then the first portion of the principal name SHOULD be * "krbtgt". All this check is done in the immediate block. */ - if (searchfor->length == 2) - if ((strncasecmp(searchfor->data[0].data, "krbtgt", - FIND_MAX(searchfor->data[0].length, strlen("krbtgt"))) == 0) && - (strncasecmp(searchfor->data[1].data, defrealm, - FIND_MAX(searchfor->data[1].length, defrealmlen)) == 0)) - return 0; + if (searchfor->length == 2) { + if (data_eq_string(searchfor->data[0], "krbtgt") && + data_eq_string(searchfor->data[1], defrealm)) + return 0; + } /* first check the length, if they are not equal, then they are not same */ if (strlen(defrealm) != searchfor->realm.length) --- krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c.orig 2010-01-12 10:49:59.000000000 +0800 +++ krb5-1.7.1/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c 2011-04-15 15:58:44.000000000 +0800 @@ -106,10 +106,10 @@ krb5_ldap_get_principal(context, searchf int *nentries; /* how much room/how many found */ krb5_boolean *more; /* are there more? */ { - char *user=NULL, *filter=NULL, **subtree=NULL; + char *user=NULL, *filter=NULL, *filtuser=NULL; unsigned int tree=0, ntrees=1, princlen=0; krb5_error_code tempst=0, st=0; - char **values=NULL, *cname=NULL; + char **values=NULL, **subtree=NULL, *cname=NULL; LDAP *ld=NULL; LDAPMessage *result=NULL, *ent=NULL; krb5_ldap_context *ldap_context=NULL; @@ -145,12 +145,18 @@ krb5_ldap_get_principal(context, searchf if ((st=krb5_ldap_unparse_principal_name(user)) != 0) goto cleanup; - princlen = strlen(FILTER) + strlen(user) + 2 + 1; /* 2 for closing brackets */ + filtuser = ldap_filter_correct(user); + if (filtuser == NULL) { + st = ENOMEM; + goto cleanup; + } + + princlen = strlen(FILTER) + strlen(filtuser) + 2 + 1; /* 2 for closing brackets */ if ((filter = malloc(princlen)) == NULL) { st = ENOMEM; goto cleanup; } - snprintf(filter, princlen, FILTER"%s))", user); + snprintf(filter, princlen, FILTER"%s))", filtuser); if ((st = krb5_get_subtree_info(ldap_context, &subtree, &ntrees)) != 0) goto cleanup; @@ -234,6 +240,9 @@ cleanup: if (user) free(user); + if (filtuser) + free(filtuser); + if (cname) free(cname);