gssd: NULL-terminate buffer after read in read_service_info (try #2)

[nfs-utils.git] / utils / gssd / gssd_proc.c

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index f415a10005229b7c04f77e2f0bf0defab329e304..fb97a13e7e2761673d130397a2318db2fbf156e7 100644 (file)
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -38,10 +38,14 @@
 
 */
 
 
 */
 

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+

 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif

-#include "config.h"
+

 #include <sys/param.h>
 #include <rpc/rpc.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <rpc/rpc.h>
 #include <sys/stat.h>


@@ -66,7 +70,6 @@
 #include "gssd.h"
 #include "err_util.h"
 #include "gss_util.h"
 #include "gssd.h"
 #include "err_util.h"
 #include "gss_util.h"

-#include "gss_oids.h"

 #include "krb5_util.h"
 #include "context.h"
 
 #include "krb5_util.h"
 #include "context.h"
 


@@ -104,7 +107,7 @@ static int
 read_service_info(char *info_file_name, char **servicename, char **servername,
                  int *prog, int *vers, char **protocol, int *port) {
 #define INFOBUFLEN 256
 read_service_info(char *info_file_name, char **servicename, char **servername,
                  int *prog, int *vers, char **protocol, int *port) {
 #define INFOBUFLEN 256

-       char            buf[INFOBUFLEN];
+       char            buf[INFOBUFLEN + 1];

        static char     dummy[128];
        int             nbytes;
        static char     service[128];
        static char     dummy[128];
        int             nbytes;
        static char     service[128];


@@ -129,6 +132,7 @@ read_service_info(char *info_file_name, char **servicename, char **servername,
        if ((nbytes = read(fd, buf, INFOBUFLEN)) == -1)
                goto fail;
        close(fd);
        if ((nbytes = read(fd, buf, INFOBUFLEN)) == -1)
                goto fail;
        close(fd);

+       buf[nbytes] = '\0';

 
        numfields = sscanf(buf,"RPC server: %127s\n"
                   "service: %127s %15s version %15s\n"
 
        numfields = sscanf(buf,"RPC server: %127s\n"
                   "service: %127s %15s version %15s\n"


@@ -448,7 +452,7 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
        return 0;
 out_err:
        if (buf) free(buf);
        return 0;
 out_err:
        if (buf) free(buf);

-       printerr(0, "Failed to write downcall!\n");
+       printerr(1, "Failed to write downcall!\n");

        return -1;
 }
 
        return -1;
 }
 


@@ -741,14 +745,14 @@ handle_krb5_upcall(struct clnt_info *clp)
                        }
                        gssd_free_krb5_machine_cred_list(credlist);
                        if (!success) {
                        }
                        gssd_free_krb5_machine_cred_list(credlist);
                        if (!success) {

-                               printerr(0, "WARNING: Failed to create krb5 context "
+                               printerr(1, "WARNING: Failed to create krb5 context "

                                         "for user with uid %d with any "
                                         "credentials cache for server %s\n",
                                         uid, clp->servername);
                                goto out_return_error;
                        }
                } else {
                                         "for user with uid %d with any "
                                         "credentials cache for server %s\n",
                                         uid, clp->servername);
                                goto out_return_error;
                        }
                } else {

-                       printerr(0, "WARNING: Failed to create krb5 context "
+                       printerr(1, "WARNING: Failed to create krb5 context "

                                 "for user with uid %d for server %s\n",
                                 uid, clp->servername);
                        goto out_return_error;
                                 "for user with uid %d for server %s\n",
                                 uid, clp->servername);
                        goto out_return_error;


@@ -756,13 +760,13 @@ handle_krb5_upcall(struct clnt_info *clp)
        }
 
        if (!authgss_get_private_data(auth, &pd)) {
        }
 
        if (!authgss_get_private_data(auth, &pd)) {

-               printerr(0, "WARNING: Failed to obtain authentication "
+               printerr(1, "WARNING: Failed to obtain authentication "

                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;
        }
 
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;
        }
 

-       if (serialize_context_for_kernel(pd.pd_ctx, &token, &krb5oid)) {
+       if (serialize_context_for_kernel(pd.pd_ctx, &token, &krb5oid, NULL)) {

                printerr(0, "WARNING: Failed to serialize krb5 context for "
                            "user with uid %d for server %s\n",
                         uid, clp->servername);
                printerr(0, "WARNING: Failed to serialize krb5 context for "
                            "user with uid %d for server %s\n",
                         uid, clp->servername);


@@ -774,8 +778,10 @@ handle_krb5_upcall(struct clnt_info *clp)
 out:
        if (token.value)
                free(token.value);
 out:
        if (token.value)
                free(token.value);

+#ifndef HAVE_LIBTIRPC

        if (pd.pd_ctx_hndl.length != 0)
                authgss_free_private_data(&pd);
        if (pd.pd_ctx_hndl.length != 0)
                authgss_free_private_data(&pd);

+#endif

        if (auth)
                AUTH_DESTROY(auth);
        if (rpc_clnt)
        if (auth)
                AUTH_DESTROY(auth);
        if (rpc_clnt)


@@ -824,7 +830,7 @@ handle_spkm3_upcall(struct clnt_info *clp)
                goto out_return_error;
        }
 
                goto out_return_error;
        }
 

-       if (serialize_context_for_kernel(pd.pd_ctx, &token, &spkm3oid)) {
+       if (serialize_context_for_kernel(pd.pd_ctx, &token, &spkm3oid, NULL)) {

                printerr(0, "WARNING: Failed to serialize spkm3 context for "
                            "user with uid %d for server\n",
                         uid, clp->servername);
                printerr(0, "WARNING: Failed to serialize spkm3 context for "
                            "user with uid %d for server\n",
                         uid, clp->servername);