[29675] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.13]: Remove meaningless checks decoding DB2
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Sep 9 17:30:28 2016
Date: Fri, 9 Sep 2016 17:30:25 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201609092130.u89LUPEi031374@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b8e22cd657bfe9815478268a0ba595007142008f
commit b8e22cd657bfe9815478268a0ba595007142008f
Author: Greg Hudson <ghudson@mit.edu>
Date: Tue Sep 6 12:58:57 2016 -0400
Remove meaningless checks decoding DB2 principals
Commit e3d9f03a658e247dbb43cb345aa93a28782fd995 (ticket 8481) added
several checks for negative length values when decoding DB2 principal
entries, including two unnecessary checks on unsigned values. Remove
those checks as they can generate warnings.
(cherry picked from commit c0f08f2eadbf179ec30008893a125722536c7802)
ticket: 8491
version_fixed: 1.13.7
src/plugins/kdb/db2/kdb_xdr.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/plugins/kdb/db2/kdb_xdr.c b/src/plugins/kdb/db2/kdb_xdr.c
index 9c2614a..e6a030f 100644
--- a/src/plugins/kdb/db2/kdb_xdr.c
+++ b/src/plugins/kdb/db2/kdb_xdr.c
@@ -364,8 +364,7 @@ krb5_decode_princ_entry(krb5_context context, krb5_data *content,
krb5_kdb_decode_int16(nextloc, (*tl_data)->tl_data_length);
nextloc += 2;
- if ((*tl_data)->tl_data_length < 0 ||
- (*tl_data)->tl_data_length > sizeleft) {
+ if ((*tl_data)->tl_data_length > sizeleft) {
retval = KRB5_KDB_TRUNCATED_RECORD;
goto error_out;
}
@@ -414,8 +413,7 @@ krb5_decode_princ_entry(krb5_context context, krb5_data *content,
krb5_kdb_decode_int16(nextloc, key_data->key_data_length[j]);
nextloc += 2;
- if (key_data->key_data_length[j] < 0 ||
- key_data->key_data_length[j] > sizeleft) {
+ if (key_data->key_data_length[j] > sizeleft) {
retval = KRB5_KDB_TRUNCATED_RECORD;
goto error_out;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
