[Git][xorg-team/lib/libxfont][debian-unstable] 10 commits: README: Remove mention of libXfont 1.5

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxfont

Commits:

13ebb8f3

by Adam Jackson at 2019-09-16T10:47:27-04:00

README: Remove mention of libXfont 1.5

xfs was ported to libXfont2 in release 1.2, and bdftopcf 1.1 includes a
copy of enough of the old libXfont1 code to not need an external
libXfont at all.

608640b8

by Jon Turney at 2019-10-25T18:37:51+01:00

Fix Win32 build since c4ed2e06 "Add some unit testing utilities"

Provide Win32 replacements for realpath() and err.h

e7b2cae1

by Peter Harris at 2020-03-06T10:42:03-05:00

Fix crash when font server connection lost

Always initialize the return value of fs_new_block_rec. Even if the
conn->blockState is FS_BROKEN_CONNECTION | FS_RECONNECTING, we must not
return with an uninitialized blockrec on the block list. When the
blockrec times out, _fs_clean_aborted_blockrec calls fs_cleanup_bfont,
which will try to follow pointers in the blockrec (which has not been
initialized).

Signed-off-by: Peter Harris <pharris@opentext.com>

9529d235

by Peter Harris at 2021-03-02T14:43:55-05:00

Fix use after free when font server connection lost

If there are multiple blocks waiting for the same font, only one of them
will have ->freeFont set. The rest will be in a state of FS_DEPENDING.

If the font server dies before the font finishes opening, the block with
->freeFont set will call ->unload_font, invalidating the pfont pointers
in the remaining FS_DEPENDING blocks.

Avoid a use after free (and potential crash) by passing conn to
fs_cleanup_font instead of dereferencing pfont to find the conn.

Signed-off-by: Peter Harris <pharris@opentext.com>

ce7a3265

by Bernd Kuhls at 2021-06-12T16:46:17-07:00

configure: define HAVE_LIBBSD when libbsd was found

daff8876

by Alex Richardson at 2021-07-14T17:23:48+01:00

Fix out-of-bounds read in FontFileMakeDir()

BuiltinReadDirectory() calls FontFileMakeDir ("", builtin_dir_count); and
this causes the `dirName[dirlen - 1]` access to read before the start of
the string. I found this while porting Xvnc to CHERI-RISC-V (which has
bounds and permissions on all pointers).

3a4f6828

by Alan Coopersmith at 2021-08-01T17:36:43-07:00

libXfont2 2.0.5

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3448f138

by Timo Aaltonen at 2021-11-17T11:37:55+02:00

Merge branch 'upstream-unstable' into debian-unstable

839f605a
by Timo Aaltonen at 2021-11-17T11:40:19+02:00
```
bump the version
```
d6ec69fe
by Timo Aaltonen at 2021-11-17T11:43:53+02:00
```
release to sid
```

Changes:

README.md

@@ -3,15 +3,10 @@ libXfont - X font handling library for server & utilities
  libXfont provides the core of the legacy X11 font system, handling the index
  files (fonts.dir, fonts.alias, fonts.scale), the various font file formats,
 -and rasterizing them.  It is used by the X servers, and will eventually be
 -used by the X Font Server (xfs), but should not be used by normal X11 clients.
 -X11 clients access fonts via either the new APIs in libXft, or the legacy
 -APIs in libX11.
+-
 -This version of libXfont is not compatible with xfs, or with the legacy
 -bdftopcf utility; these packages require libXfont 1.5, not libXfont 2.0
 -or later. The two versions can be installed in parallel, and eventually
 -the need for 1.5 will go away. We apologize for the inconvenience.
 +and rasterizing them.  It is used by the X display servers (Xorg, Xvfb, etc.)
 +and the X Font Server (xfs), but should not be used by normal X11 clients.  X11
 +clients access fonts via either the new APIs in libXft, or the legacy APIs in
 +libX11.
  libXfont supports a number of compression and font formats, and the
  configure script takes various options to enable or disable them:

configure.ac

@@ -21,7 +21,7 @@
  # Initialize Autoconf
  AC_PREREQ([2.60])
 -AC_INIT([libXfont2], [2.0.4],
 +AC_INIT([libXfont2], [2.0.5],
  	[https://gitlab.freedesktop.org/xorg/lib/libXfont/issues], [libXfont2])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([config.h])
@@ -53,8 +53,14 @@ AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
  # Checks for library functions.
  AC_CHECK_FUNCS([poll readlink])
  AC_SEARCH_LIBS([strlcat], [bsd])
 +if test "$ac_cv_search_strlcat" = "-lbsd"; then
 +  AC_DEFINE(HAVE_LIBBSD,1,[Has libbsd])
 +fi
  AC_CONFIG_LIBOBJ_DIR([src/util])
 -AC_REPLACE_FUNCS([reallocarray strlcat strlcpy])
 +AC_REPLACE_FUNCS([reallocarray realpath strlcat strlcpy])
++
 +# Check for BSDish err.h
 +AC_CHECK_HEADERS([err.h])
  # If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
  # must first be located explicitly.

debian/changelog

 +libxfont (1:2.0.5-1) unstable; urgency=medium
++
 +  * New upstream release.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 17 Nov 2021 11:43:44 +0200
++
  libxfont (1:2.0.4-1) unstable; urgency=medium
    * New upstream release.

src/fc/fserve.c

@@ -124,14 +124,14 @@ static CARD32	fs_blockState;
  static int _fs_restart_connection ( FSFpePtr conn );
  static void fs_send_query_bitmaps ( FontPathElementPtr fpe,
  				   FSBlockDataPtr blockrec );
 -static int fs_send_close_font ( FontPathElementPtr fpe, Font id );
 +static int fs_send_close_font (FSFpePtr conn, Font id);
  static void fs_client_died ( pointer client, FontPathElementPtr fpe );
  static void _fs_client_access ( FSFpePtr conn, pointer client, Bool sync );
  static void _fs_client_resolution ( FSFpePtr conn );
  static fsGenericReply *fs_get_reply (FSFpePtr conn, int *error);
  static int fs_await_reply (FSFpePtr conn);
  static void _fs_do_blocked (FSFpePtr conn);
 -static void fs_cleanup_bfont (FSBlockedFontPtr bfont);
 +static void fs_cleanup_bfont (FSFpePtr conn, FSBlockedFontPtr bfont);
  char _fs_glyph_undefined;
  char _fs_glyph_requested;
@@ -546,7 +546,7 @@ _fs_clean_aborted_blockrec(FSFpePtr conn, FSBlockDataPtr blockrec)
      case FS_OPEN_FONT: {
  	FSBlockedFontPtr bfont = (FSBlockedFontPtr)blockrec->data;
 -	fs_cleanup_bfont (bfont);
 +	fs_cleanup_bfont (conn, bfont);
  	_fs_signal_clients_depending(&bfont->clients_depending);
  	break;
+     }
@@ -585,16 +585,12 @@ fs_abort_blockrec(FSFpePtr conn, FSBlockDataPtr blockrec)
   * then unload the partially created font
   */
  static void
 -fs_cleanup_bfont (FSBlockedFontPtr bfont)
 +fs_cleanup_bfont (FSFpePtr conn, FSBlockedFontPtr bfont)
+ {
 -    FSFontDataRec *fsd;
+-
      if (bfont->pfont)
+     {
 -	fsd = (FSFontDataRec *) bfont->pfont->fpePrivate;
+-
  	/* make sure the FS knows we choked on it */
 -	fs_send_close_font(bfont->pfont->fpe, bfont->fontid);
 +	fs_send_close_font(conn, bfont->fontid);
  	/*
  	 * Either unload the font if it's being opened for
@@ -612,7 +608,10 @@ fs_cleanup_bfont (FSBlockedFontPtr bfont)
  	    bfont->pfont = 0;
+ 	}
  	else
 +	{
 +	    FSFontDataRec *fsd = (FSFontDataRec *)bfont->pfont->fpePrivate;
  	    fsd->generation = -1;
 +	}
+     }
+ }
@@ -746,7 +745,7 @@ fs_read_open_font(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
  	    return StillWorking;
  	if (rep)
  	    _fs_done_read (conn, rep->length << 2);
 -	fs_cleanup_bfont (bfont);
 +	fs_cleanup_bfont (conn, bfont);
  	_fs_reply_failed (rep, fsOpenBitmapFontReply, "!=");
  	return BadFontName;
+     }
@@ -762,7 +761,7 @@ fs_read_open_font(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
      if (rep->otherid && !(bfont->flags & FontReopen))
+     {
 -	fs_cleanup_bfont (bfont);
 +	fs_cleanup_bfont (conn, bfont);
  	/* Find old font if we're completely done getting it from server. */
  	bfont->pfont = find_old_font(rep->otherid);
@@ -891,7 +890,7 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
  	    return StillWorking;
  	if (rep)
  	    _fs_done_read (conn, rep->length << 2);
 -	fs_cleanup_bfont (bfont);
 +	fs_cleanup_bfont (conn, bfont);
  	_fs_reply_failed (rep, fsQueryXInfoReply, "<");
  	return BadFontName;
+     }
@@ -964,7 +963,7 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
      if (ret == -1)
+     {
 -	fs_cleanup_bfont (bfont);
 +	fs_cleanup_bfont (conn, bfont);
  	return AllocError;
+     }
@@ -983,7 +982,7 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
+ 	}
  	else
+ 	{
 -	    fs_cleanup_bfont (bfont);
 +	    fs_cleanup_bfont (conn, bfont);
  	    err = BadFontName;
+ 	}
  	_fs_free_props (pInfo);
@@ -1056,7 +1055,7 @@ fs_read_extent_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
  	    return StillWorking;
  	if (rep)
  	    _fs_done_read (conn, rep->length << 2);
 -	fs_cleanup_bfont (bfont);
 +	fs_cleanup_bfont (conn, bfont);
  	_fs_reply_failed (rep, fsQueryXExtents16Reply, "<");
  	return BadFontName;
+     }
@@ -1094,7 +1093,7 @@ fs_read_extent_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
      if (!pCI)
+     {
  	_fs_done_read (conn, rep->length << 2);
 -	fs_cleanup_bfont(bfont);
 +	fs_cleanup_bfont(conn, bfont);
  	return AllocError;
+     }
      fsfont->encoding = pCI;
@@ -1697,16 +1696,6 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
  	return AllocError;
+     }
 -    /*
 -     * Must check this before generating any protocol, otherwise we'll
 -     * mess up a reconnect in progress
 -     */
 -    if (conn->blockState & (FS_BROKEN_CONNECTION | FS_RECONNECTING))
 -    {
 -	_fs_pending_reply (conn);
 -	return Suspended;
 -    }
+-
      fsd->generation = conn->generation;
      bfont = (FSBlockedFontPtr) blockrec->data;
@@ -1718,6 +1707,16 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
      bfont->clients_depending = (FSClientsDependingPtr)0;
      bfont->freeFont = (flags & FontReopen) == 0;
 +    /*
 +     * Must check this before generating any protocol, otherwise we'll
 +     * mess up a reconnect in progress
 +     */
 +    if (conn->blockState & (FS_BROKEN_CONNECTION | FS_RECONNECTING))
 +    {
 +	_fs_pending_reply (conn);
 +	return Suspended;
 +    }
++
      _fs_client_access (conn, client, (flags & FontOpenSync) != 0);
      _fs_client_resolution(conn);
@@ -1788,7 +1787,7 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
  	if (err == Successful)
  	    *ppfont = bfont->pfont;
  	else
 -	    fs_cleanup_bfont (bfont);
 +	    fs_cleanup_bfont (conn, bfont);
  	bfont->freeFont = FALSE;
  	_fs_remove_block_rec (conn, blockrec);
+     }
@@ -1845,7 +1844,7 @@ fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
  	    if (err == Successful)
  		*ppfont = bfont->pfont;
  	    else
 -		fs_cleanup_bfont (bfont);
 +		fs_cleanup_bfont (conn, bfont);
  	    _fs_remove_block_rec (conn, blockrec);
  	    return err;
+ 	}
@@ -1856,9 +1855,8 @@ fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
  /* ARGSUSED */
  static int
 -fs_send_close_font(FontPathElementPtr fpe, Font id)
 +fs_send_close_font(FSFpePtr conn, Font id)
+ {
 -    FSFpePtr    conn = (FSFpePtr) fpe->private;
      fsCloseReq  req;
      if (conn->blockState & FS_GIVE_UP)
@@ -1882,7 +1880,7 @@ fs_close_font(FontPathElementPtr fpe, FontPtr pfont)
      FSFpePtr	    conn = (FSFpePtr) fpe->private;
      if (conn->generation == fsd->generation)
 -	fs_send_close_font(fpe, fsd->fontid);
 +	fs_send_close_font(conn, fsd->fontid);
  #ifdef DEBUG
+     {

src/fontfile/fontdir.c

@@ -125,10 +125,7 @@ FontFileMakeDir(const char *dirName, int size)
  	dirlen = strlen(dirName);
  	attriblen = 0;
+     }
 -    if (dirName[dirlen - 1] != '/')
 -#ifdef NCD
 -    if (dirlen)     /* leave out slash for builtins */
 -#endif
 +    if (dirlen && dirName[dirlen - 1] != '/')
  	needslash = 1;
      dir = malloc(sizeof *dir + dirlen + needslash + 1 +
  		 (attriblen ? attriblen + 1 : 0));

src/util/realpath.c

 +/*
 + * Copyright © 2019 Jon Turney.
 + *
 + * Permission to use, copy, modify, and distribute this software for any
 + * purpose with or without fee is hereby granted, provided that the above
 + * copyright notice and this permission notice appear in all copies.
 + *
 + * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
 + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
 + * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 + */
++
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
++
 +#include "src/util/replace.h"
++
 +#ifdef WIN32
 +char *
 +realpath(const char *path, char *resolved_path)
 +{
 +  return _fullpath(resolved_path, path, _MAX_PATH);
 +}
 +#endif

src/util/replace.h

@@ -57,5 +57,21 @@ extern _X_HIDDEN size_t
  strlcat(char *dst, const char *src, size_t siz);
  #endif
 +#ifndef HAVE_ERR_H
 +#define err(eval, ...) do { \
 +  fprintf(stderr, __VA_ARGS__); \
 +  fprintf(stderr, "\n"); \
 +  exit(eval); \
 +  } while (0)
 +#define vwarn(...) do { \
 +  fprintf(stderr, __VA_ARGS__); \
 +  fprintf(stderr, "\n"); \
 +  } while (0)
 +#endif
++
 +#ifndef HAVE_REALPATH
 +extern _X_HIDDEN char *
 +realpath(const char *path, char *resolved_path);
 +#endif
  #endif /* XFONT_REPLACE_H */

test/utils/font-test-utils.c

@@ -58,7 +58,10 @@ SOFTWARE.
  #include <stdlib.h>
  #include <limits.h>
  #include <assert.h>
 +#ifdef HAVE_ERR_H
  #include <err.h>
 +#endif
 +#include "src/util/replace.h"
  #include <X11/X.h>
  static unsigned long server_generation;

test/utils/lsfontdir.c

@@ -30,7 +30,10 @@
  #include "font-test-utils.h"
  #include <stdio.h>
  #include <assert.h>
 +#ifdef HAVE_ERR_H
  #include <err.h>
 +#endif
 +#include "src/util/replace.h"
  int
  main(int argc, char **argv)