sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-31 10:26:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security/heimdal*: The version string must always contain a terminating NUL

Browse source 
Should the sender send a string without a terminating NUL, ensure that
the NUL terminates the string regardless.

And while at it only process the version string when bytes are returned.

PR:		267884
Reported by:	Robert Morris <rtm@lcs.mit.edu>
MFH:		2022Q4
This commit is contained in:
Cy Schubert 2022-11-21 14:41:13 -08:00
parent 22a683a337
commit d831a2fe48
4 changed files with 86 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/heimdal-devel/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= heimdal
PORTVERSION= ${HEIMDAL_COMMIT_DATE}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
PKGNAMESUFFIX= -devel
HASH= 8f9c2d115

42
security/heimdal-devel/files/patch-lib_krb5_recvauth.c Normal file
View file

@ -0,0 +1,42 @@
--- lib/krb5/recvauth.c.orig 2022-09-15 16:54:19.000000000 -0700
+++ lib/krb5/recvauth.c 2022-11-21 14:37:31.130429000 -0800
@@ -98,7 +98,7 @@
const char *version = KRB5_SENDAUTH_VERSION;
char her_version[sizeof(KRB5_SENDAUTH_VERSION)];
char *her_appl_version;
- uint32_t len;
+ uint32_t len, bytes;
u_char repl;
krb5_data data;
krb5_flags ap_options;
@@ -166,15 +166,21 @@
krb5_net_write (context, p_fd, &repl, 1);
return krb5_enomem(context);
}
- if (krb5_net_read (context, p_fd, her_appl_version, len) != len
- || !(*match_appl_version)(match_data, her_appl_version)) {
- repl = 2;
- krb5_net_write (context, p_fd, &repl, 1);
- krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS,
- N_("wrong sendauth application version (%s)", ""),
- her_appl_version);
- free (her_appl_version);
- return KRB5_SENDAUTH_BADAPPLVERS;
+ if ((bytes = krb5_net_read (context, p_fd, her_appl_version, len))) {
+ /* PR/267884: String read must always conatain a terminating NUL */
+ if (strnlen(her_appl_version, len) == len)
+ her_appl_version[len-1] = '\0';
+
+ if (bytes != len ||
+ !(*match_appl_version)(match_data, her_appl_version)) {
+ repl = 2;
+ krb5_net_write (context, p_fd, &repl, 1);
+ krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS,
+ N_("wrong sendauth application version (%s)", ""),
+ her_appl_version);
+ free (her_appl_version);
+ return KRB5_SENDAUTH_BADAPPLVERS;
+ }
}
free (her_appl_version);

2
security/heimdal/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= heimdal
PORTVERSION= 7.8.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/

42
security/heimdal/files/patch-lib_krb5_recvauth.c Normal file
View file

@ -0,0 +1,42 @@
--- lib/krb5/recvauth.c.orig 2022-09-15 16:54:19.000000000 -0700
+++ lib/krb5/recvauth.c 2022-11-21 14:37:31.130429000 -0800
@@ -98,7 +98,7 @@
const char *version = KRB5_SENDAUTH_VERSION;
char her_version[sizeof(KRB5_SENDAUTH_VERSION)];
char *her_appl_version;
- uint32_t len;
+ uint32_t len, bytes;
u_char repl;
krb5_data data;
krb5_flags ap_options;
@@ -166,15 +166,21 @@
krb5_net_write (context, p_fd, &repl, 1);
return krb5_enomem(context);
}
- if (krb5_net_read (context, p_fd, her_appl_version, len) != len
- || !(*match_appl_version)(match_data, her_appl_version)) {
- repl = 2;
- krb5_net_write (context, p_fd, &repl, 1);
- krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS,
- N_("wrong sendauth application version (%s)", ""),
- her_appl_version);
- free (her_appl_version);
- return KRB5_SENDAUTH_BADAPPLVERS;
+ if ((bytes = krb5_net_read (context, p_fd, her_appl_version, len))) {
+ /* PR/267884: String read must always conatain a terminating NUL */
+ if (strnlen(her_appl_version, len) == len)
+ her_appl_version[len-1] = '\0';
+
+ if (bytes != len ||
+ !(*match_appl_version)(match_data, her_appl_version)) {
+ repl = 2;
+ krb5_net_write (context, p_fd, &repl, 1);
+ krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS,
+ N_("wrong sendauth application version (%s)", ""),
+ her_appl_version);
+ free (her_appl_version);
+ return KRB5_SENDAUTH_BADAPPLVERS;
+ }
}
free (her_appl_version);