From nobody Sat Feb 18 17:55:01 2023 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 4PJxCp0chGz3spSd; Sat, 18 Feb 2023 17:55:02 +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 4PJxCp072hz4H4p; Sat, 18 Feb 2023 17:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676742902; 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=fI5ROyz3OYFhzGNiStfjI5KW0iuedrSQPsdFVIXhXJo=; b=nvsp2x1PsdTtFRNRW9xbU3oCzBQ51//vAQEHmqQ6u1C58+foX8uO4LEhfjSeChWqR37Tr8 3Bx/aRyEU6cysd4kREPpc9Y+o+3kVHqsK2vjBgzGk/PlVySq/0pvqZ+qgCQlMF0e0FRpxc b4jjhr1dspEJW2RFJ2NylECGjF+2zetxBnmnVZ4h/zZ1N2dnCkWJdRkxHQFvPyhO4JnoG+ tyPF6zaXO99SuLlNoBBB1PQbLK11iuax78fw2p6UccfK3dTgQiP93AFdP1siFwyFdOT64S a3QeNl9Ext7hz9nQdRpoXcP4DnTaIIbhneQsOYRpf51wNqWAZIWVYFX/Xwe9VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676742902; 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=fI5ROyz3OYFhzGNiStfjI5KW0iuedrSQPsdFVIXhXJo=; b=fq/JQvohrI+J5b32hYH3KE7mlmqxaNzRBkM4L4BOcKdto7wYB+Q4eucI6x9uG++tmty7az 2cJNeS6Kj2XAaaW9TDumR91B8Ddfuimjiw4U1u78eo0iReyERIcGOo9yb0DIiFHY6+CNDq JrCR6cXRonU5H3wnrWXFQ8QqALsa9QuXOMt5x4jZ5h3V8ECPyOaeGR0Busqs0hOlc1gaKs jLjRiX7NGRodoyhxnuzlVNRnaQiuVCAYy9xJFpf4OKOmZsmiMhC7TBUW4RwMwgFU+DsXwf 7r2LIPPjb1HvirgmrAhscSVDZZ5FSChBbSckL42CrrxrhVpcY1HBCWyP9ZkuNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676742902; a=rsa-sha256; cv=none; b=QVFFh1mMoJ7ZxTPEgXhdszTGZW9mHV8IwXwOeqALJOFQ9ClHv74vJdhelae5HGO3zx3Uin 1QqLQAqh5n+qkwFXV+ShAf1X4jm0zlw7oiAvrqpcw0YmXWblTa2/fizlX+2P/fLS0ohEOv QCGwq7Dgry8PdYf9KhpdQHeOwS5tiGSjTryhF3oZpD8Y1zebhxzc9x0dxF/aF+vOBU/jZ3 8uXGQBiN8z+NQRjl4KLqkYckMB/ABV3tId+qZ3RrHAN3e80m5ld8IBS5YhO9bSqg5Owkp5 n3g5ZjX7uQSkOS2FYd2qe1sYcorIo6hThNJRI6fm2/J+jCNZCAucGonyPjXRXA== 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 4PJxCn6CjmzWRH; Sat, 18 Feb 2023 17:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31IHt1ln083443; Sat, 18 Feb 2023 17:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31IHt12T083442; Sat, 18 Feb 2023 17:55:01 GMT (envelope-from git) Date: Sat, 18 Feb 2023 17:55:01 GMT Message-Id: <202302181755.31IHt12T083442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3f70fca90f9f - main - netlink: check result of sooptcopyin(). 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f70fca90f9f1c6a40e55e6edd2dc1b1272f4998 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3f70fca90f9f1c6a40e55e6edd2dc1b1272f4998 commit 3f70fca90f9f1c6a40e55e6edd2dc1b1272f4998 Author: Alexander V. Chernikov AuthorDate: 2023-02-18 17:15:25 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-18 17:53:05 +0000 netlink: check result of sooptcopyin(). CID: 1498866 MFC after: 2 weeks --- sys/netlink/netlink_domain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 4d34fd381c39..630ce47cd228 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -612,7 +612,9 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) switch (sopt->sopt_name) { case NETLINK_ADD_MEMBERSHIP: case NETLINK_DROP_MEMBERSHIP: - sooptcopyin(sopt, &optval, sizeof(optval), sizeof(optval)); + error = sooptcopyin(sopt, &optval, sizeof(optval), sizeof(optval)); + if (error != 0) + break; if (optval <= 0 || optval >= NLP_MAX_GROUPS) { error = ERANGE; break; @@ -629,7 +631,9 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) case NETLINK_CAP_ACK: case NETLINK_EXT_ACK: case NETLINK_GET_STRICT_CHK: - sooptcopyin(sopt, &optval, sizeof(optval), sizeof(optval)); + error = sooptcopyin(sopt, &optval, sizeof(optval), sizeof(optval)); + if (error != 0) + break; flag = nl_getoptflag(sopt->sopt_name);