In the `doListFontsAndAliases` function in dixfonts.c, when a font alias
is encountered (`err == FontNameAlias`) as a result of
`list_next_font_or_alias` call, the code allocates memory for
`resolved` variable (`resolvedlen + 1` bytes) for storing target font
name. In this case, if the `malloc(resolvedlen + 1)` call fails,
`resolved` remains NULL.
Later, when check (`else if (err == FontNameAlias)`) is TRUE, the code
uses `memcpy` to copy nullable `resolved` into `tmp_pattern` without
checking if `resolved` is NULL, so there is a potential null ptr
dereference.
This commit replaces `malloc` with `XNFalloc` for allocating memory for
`resolved`. `XNFalloc` will internally check result of `malloc` and stop
program execution if allocation was failed, preventing potential NULL
dereferencing.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by: Mikhail Dmitrichenko <m.dmitrichenko222@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2114>
Not used by any external module/driver, so no need to keep it
public. Also move it to the new dix settings code and rename it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Move the declaration of alwaysCheckForInput closer to where it is first
used and initialize it at declaration rather than assigning it later.
Signed-off-by: Aggelos Tselios <aggelostselios777@gmail.com>
Mixing result variables for separate things is making the code hard
to understand, so add a new local variable for temporarily storing
the result of ReadRequestFromClient().
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
a) trade a little bit of code size for speed
(depending on exact caller, compiler might also optimize a lot)
b) reduce the need for exported, but non-public symbol
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
add some macros for making request handlers and byte swapping easier:
* X_REQUEST_HEAD_STRUCT(type) and X_REQUEST_HEAD_AT_LEAST(type)
declare header struct pointers and check size
* X_REQUEST_FIELD_CARD16(field)
swaps a CARD16 (word) header field (if neccessary)
* X_REQUEST_FIELD_CARD32(field)
swaps a CARD32 (dword) header field (if neccessary)
* X_REQUEST_REST_CARD16()
swaps remaining CARD16 array payload (if necessary)
* X_REQUEST_REST_CARD32()
swaps remaining CARD32 array payload (if necessary)
* X_REQUEST_REST_COUNT_CARD16(count)
check swaps `count` CARD16 payload fields and checks size
* X_REQUEST_REST_COUNT_CARD32(count)
check swaps `count` CARD32 payload fields and checks size
How to use them:
1. put X_REQUEST_HEAD_STRUCT() or X_REQUEST_HEAD_AT_LEAST() ontop of each Proc*()
2. add X_REQUEST_FIELD_*() et al below, for all fields to be swapped and
drop the corresponding SProc*()'s
3. let the dispatchers call Proc*() instead of SProc*()
Notes:
* the length field is already swapped before request handlers called
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Current code walks along all screens and initializes screen resources,
then gc's, stipples, root windows for each of them, hence after
the first screen registering new private keys is no more possible.
This crashes modesetting driver if it is not initialized before others.
This patch makes screen resources for all screen initialize first, hence
all necessary private keys (including of the type PRIVATE_WINDOW) are
initialized before root windows are created.
Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
Nothing in there that we need, include <regionstr.h> instead.
But keeping the file in place, until all external consumer have
been migrated.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This patch exports ConnectionInfo in server_priv.h and references
it in globals.c to force exporting.
Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
Now that we have untwisted Xinerama side, it's trivial to inline
the few lines for byte-swapping into the actual handlers.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Adding new source and header that's going to host all DIX
settings (set via cmdline or xf86 config file) in the future.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Not used by any external drivers, so no need to keep it in public SDK.
Since it's used by internal modules, still needs to be _X_EXPORT'ed.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Not used anywhere, neither in Xserver nor in drivers, so no need
to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Still needs to be _X_EXPORT'ed for internal modules, but
not supposed to be visible to external drivers.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Only internally within OS layer and screen saver logic,
so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Since we're always terminating now, everbody can call UnlockServer()
directly, so we don't need that extra function anymore.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
