From nobody Fri Jan 12 21:12:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TBZ3p1dxmz56Mtl; Fri, 12 Jan 2024 21:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TBZ3p17j9z4WQg; Fri, 12 Jan 2024 21:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705093926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHUwqI13Hp2qaLTUFu4y4CQA5NOo8gaXFtaHXuGJiDg=; b=hmVnLfM8eG4P+0zcVhyDAff9R6aEd/Jk/5Ebjn7N2wRgE4ZI6Gu4Sn2Tv9ySuaaA0Uzore 95pnGnlB10DlaPKVo0hXLFVqnEjLGb/kLorRcnFJ/4jzfut+k/MQVhbdG3IWW4UHxupI85 4xI8hSE03aEEBVLl9UfpoP0H2j8xvMLrr4C0pF1sYLF8C3DeaaP3F7VRxJDWJ2KcFXGcE7 KJmNmQf9M0jHh3J/fWx71Ye3THQzZGS+WGHFw41IOAcxQn0WXzLsYG6bPddA3XBQY7APDg 81wKyF7j7awAFWNv9sMHjG0MussWwAyorSnY9Q4KHQfYa+Tqk6npLNrRNQGhAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705093926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHUwqI13Hp2qaLTUFu4y4CQA5NOo8gaXFtaHXuGJiDg=; b=inrOuC37Nn3gK0CEOLERoqgPgJf1aCELjg16Ui1uR5ZJZLwl4L8X+8A6tz+dYgwrRJO+2e v5Q2WqKcJdrmq+76Vgirmc4OieOBnwwPvoZQcv/uL5rpMWl0lR8rWtCwKpdYvcwlu+WD+w mAR4fAuit/y2BfHEsFIz9M/40W1/NGM/JzBN4MJQs1RG/Lg52Ax5V0KOfjaIyQU8S0q7SL 68d6S1NdzxErWtlSX6CSTHzWl9MVa8cVSikt5c/RadX+8cvYh30COgXLaRD37eBR8aLby4 78Hb5k++kR40Lnjb/aVJBrCe8pF93JYGnbNGmx+UbkcRTYR0fniCnY8d3hcW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705093926; a=rsa-sha256; cv=none; b=ySeD4Y+axxu5oe3O/+lh9DU/UaGm7kX1uFkw5cBvN2x0YHzbXNSd6skoql+p5jLIaKmjgk Z8FG543Ri7gIT0uasN4u5tj2y77+eRIOzMQd3f2/5L7dWJEkqwuImU3eL7TUWXCzRGOYEx WM1WOXNUK036i15E88R8Mk03WLrrdyymFa2FK2AZQDUUp3CD2hBvK/fLaLhNFHBpJgMXNb BqJ3bSHXu0nLrSlEGJ8kKQ7lU5TIcs/hZcYvMlOeZoJnXnuPBRFYx31EBhN0bDpp1fuMjS BDqu2tzQ05PnartHyBJi5+7eUdbYq7gnULwZxPQu7qqyCteyQrx+o3bGnIxqdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TBZ3p07V2z1HHd; Fri, 12 Jan 2024 21:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CLC5Z2039219; Fri, 12 Jan 2024 21:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CLC5HB039216; Fri, 12 Jan 2024 21:12:05 GMT (envelope-from git) Date: Fri, 12 Jan 2024 21:12:05 GMT Message-Id: <202401122112.40CLC5HB039216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 848a8bf3f40d - main - fb: Check for errors from copyin() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848a8bf3f40d91bda0ae3ab67f22ed693f25f9c4 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=848a8bf3f40d91bda0ae3ab67f22ed693f25f9c4 commit 848a8bf3f40d91bda0ae3ab67f22ed693f25f9c4 Author: Mark Johnston AuthorDate: 2024-01-12 15:09:22 +0000 Commit: Mark Johnston CommitDate: 2024-01-12 20:56:00 +0000 fb: Check for errors from copyin() When compiling with gcc, a function annotated with __result_use_check cannot have its return value ignored with a void cast. So, try to handle it. MFC after: 1 week --- sys/dev/fb/vesa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c index e1cca3a70725..dcd3d34076bf 100644 --- a/sys/dev/fb/vesa.c +++ b/sys/dev/fb/vesa.c @@ -1732,11 +1732,15 @@ set_palette(video_adapter_t *adp, int base, int count, r = malloc(count * 3, M_DEVBUF, M_WAITOK | M_ZERO); g = r + count; b = g + count; - (void)copyin(red, r, count); - (void)copyin(green, g, count); - (void)copyin(blue, b, count); + if (copyin(red, r, count) != 0 || + copyin(green, g, count) != 0 || + copyin(blue, b, count) != 0) { + error = 1; + goto out; + } error = vesa_bios_load_palette2(base, count, r, g, b, bits); +out: free(r, M_DEVBUF); return (error);