From patchwork Mon Mar 26 10:26:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10307615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C316600F6 for ; Mon, 26 Mar 2018 10:27:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 316E32962C for ; Mon, 26 Mar 2018 10:27:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 262B82962E; Mon, 26 Mar 2018 10:27:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D638D2962C for ; Mon, 26 Mar 2018 10:27:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EC716E47F; Mon, 26 Mar 2018 10:27:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id 78CB46E47C for ; Mon, 26 Mar 2018 10:27:17 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id BD6A7A45B668E for ; Mon, 26 Mar 2018 11:27:13 +0100 (IST) Received: from localhost.localdomain (10.60.4.28) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.382.0; Mon, 26 Mar 2018 11:27:15 +0100 From: Eric Engestrom To: Subject: [PATCH libdrm 2/3] xf86drm: add buffer size safety to sprintf() Date: Mon, 26 Mar 2018 11:26:47 +0100 Message-ID: <20180326102648.1754-2-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180326102648.1754-1-eric.engestrom@imgtec.com> References: <20180326102648.1754-1-eric.engestrom@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.60.4.28] X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Engestrom --- xf86drm.c | 6 +++--- xf86drmMode.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index b6e5d8cc1bb50ffe75a2..5701952ae83634b47628 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -349,7 +349,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type) return -EINVAL; }; - sprintf(buf, dev_name, DRM_DIR_NAME, minor); + snprintf(buf, sizeof(buf), dev_name, DRM_DIR_NAME, minor); drmMsg("drmOpenDevice: node name is %s\n", buf); if (drm_server_info && drm_server_info->get_perms) { @@ -473,7 +473,7 @@ static int drmOpenMinor(int minor, int create, int type) return -EINVAL; }; - sprintf(buf, dev_name, DRM_DIR_NAME, minor); + snprintf(buf, sizeof(buf), dev_name, DRM_DIR_NAME, minor); if ((fd = open(buf, O_RDWR, 0)) >= 0) return fd; return -errno; @@ -681,7 +681,7 @@ static int drmOpenByName(const char *name, int type) char *driver, *pt, *devstring; int retcode; - sprintf(proc_name, "/proc/dri/%d/name", i); + snprintf(proc_name, sizeof(proc_name), "/proc/dri/%d/name", i); if ((fd = open(proc_name, 0, 0)) >= 0) { retcode = read(fd, buf, sizeof(buf)-1); close(fd); diff --git a/xf86drmMode.c b/xf86drmMode.c index 9a15b5e78dda9a4bb7e4..d482ef79c0dc35d639d0 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -753,7 +753,8 @@ int drmCheckModesettingSupported(const char *busid) if (ret != 4) return -EINVAL; - sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm", + snprintf(pci_dev_dir, sizeof(pci_dev_dir), + "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm", domain, bus, dev, func); sysdir = opendir(pci_dev_dir); @@ -772,7 +773,8 @@ int drmCheckModesettingSupported(const char *busid) return 0; } - sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/", + snprintf(pci_dev_dir, sizeof(pci_dev_dir), + "/sys/bus/pci/devices/%04x:%02x:%02x.%d/", domain, bus, dev, func); sysdir = opendir(pci_dev_dir);