From: Eric Engestrom <eric.engestrom@intel.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH libdrm 2/3] xf86drm: use max size of drm node name instead of arbitrary size
Date: Wed, 19 Dec 2018 17:08:02 +0000 [thread overview]
Message-ID: <20181219170803.23452-2-eric.engestrom@intel.com> (raw)
In-Reply-To: <20181219170803.23452-1-eric.engestrom@intel.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
xf86drm.c | 4 ++--
xf86drm.h | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/xf86drm.c b/xf86drm.c
index 07425b19897d00a19e8a..95854e153ec7e9d264bc 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -317,7 +317,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
{
stat_t st;
const char *dev_name;
- char buf[64];
+ char buf[DRM_NODE_NAME_MAX];
int fd;
mode_t devmode = DRM_DEV_MODE, serv_mode;
gid_t serv_group;
@@ -445,7 +445,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
static int drmOpenMinor(int minor, int create, int type)
{
int fd;
- char buf[64];
+ char buf[DRM_NODE_NAME_MAX];
const char *dev_name;
if (create)
diff --git a/xf86drm.h b/xf86drm.h
index 18668ff3d40d7db55c95..00fbdb35a9a8fb5e9f27 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -93,6 +93,14 @@ extern "C" {
#define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d"
#define DRM_RENDER_DEV_NAME "%s/" DRM_RENDER_MINOR_NAME "%d"
+#define DRM_NODE_NAME_MAX \
+ (sizeof(DRM_DIR_NAME) + 1 /* slash */ \
+ + MAX3(sizeof(DRM_PRIMARY_MINOR_NAME), \
+ sizeof(DRM_CONTROL_MINOR_NAME), \
+ sizeof(DRM_RENDER_MINOR_NAME)) \
+ + sizeof("64") /* highest possible node number */ \
+ + 1) /* NULL-terminator */
+
#define DRM_ERR_NO_DEVICE (-1001)
#define DRM_ERR_NO_ACCESS (-1002)
#define DRM_ERR_NOT_ROOT (-1003)
--
Cheers,
Eric
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-12-19 17:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-19 17:08 [PATCH libdrm 1/3] xf86drm: dedupe `#define`s Eric Engestrom
2018-12-19 17:08 ` Eric Engestrom [this message]
2018-12-19 17:08 ` [PATCH libdrm 3/3] xf86drm: dedupe drmGetDeviceName() logic Eric Engestrom
2019-02-18 17:10 ` [PATCH libdrm 1/3] xf86drm: dedupe `#define`s Eric Engestrom
2019-02-19 11:46 ` Emil Velikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181219170803.23452-2-eric.engestrom@intel.com \
--to=eric.engestrom@intel.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox