Patch: NULL pointer deref in pcf_check_dbms_client() with unreadable map file

[Viktor Dukhovni]

On Tue, May 08, 2018 at 10:39:56AM -0300, Andreas Hasenack wrote:

> Just before there is a check for fp == 0, but looking for errno != EACCES,
> and EACCES is exactly what I got:
>         if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0
>             && errno != EACCES) {
>             msg_warn("open \"%s\" configuration \"%s\": %m",
>                      dp->db_type, cf_file);
>             myfree(dict_spec);
>             return;
>         }

I think the intent was:

diff --git a/src/postconf/postconf_dbms.c b/src/postconf/postconf_dbms.c
index 707bafa5..eddeab0a 100644
--- a/src/postconf/postconf_dbms.c
+++ b/src/postconf/postconf_dbms.c
@@ -174,10 +174,10 @@ static void pcf_check_dbms_client(const PCF_DBMS_INFO 
*dp, const char *cf_file)
         */
        dict = dict_ht_open(dict_spec, O_CREAT | O_RDWR, 0);
        dict_register(dict_spec, dict);
-       if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0
-           && errno != EACCES) {
-           msg_warn("open \"%s\" configuration \"%s\": %m",
-                    dp->db_type, cf_file);
+       if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0) {
+           if (errno != EACCES)
+               msg_warn("open \"%s\" configuration \"%s\": %m",
+                        dp->db_type, cf_file);
            myfree(dict_spec);
            return;
        }

-- 
        Viktor.