From nobody Sat Mar 4 09:12:51 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 4PTJyr2lzlz3vmtP; Sat, 4 Mar 2023 09:12:52 +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 4PTJyr0Jxcz40CF; Sat, 4 Mar 2023 09:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921172; 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=i/W4pQLPpiEwCV4ZfHe+YDuLfluHrkBYbxTQ6LBQ0Io=; b=Wk9GS+2TgWY0Q2P8DkQ73h6edKLLiYLkPF48nj28RcWZ7OoZENIYZ35+CbvDCIaiDs7FpU Opyl7NuMLdYU3JfRK33dXArQsEx7tXq/4k/4ckzjaDMVyj5GZjmY8EX/zlJOg/0OrDDgle wRR4vjoRSgAXNlfNgEX18/HwU3xai3DeppZqxBbnY5XYqpKQ0EQbMre6toMBvbF0Aguvmr Iyx2UnE90sh5pAnQF7qkgNi/EiQZZNveHM9JvUiqjloEI/FGZ4eCNo/cM70nwPXzfXo7uV Ru2ZeVXeIjnoegeEBka0zVhfHnl64BO7oPq96NVaJ2pp5P1iCtU5D0e14snl2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921172; 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=i/W4pQLPpiEwCV4ZfHe+YDuLfluHrkBYbxTQ6LBQ0Io=; b=XDMf0WjWi3uoKkHOthvbLs3g4qqSVPiUTx+Vw+c4klzGBdcC8Pcr4UQkINaQTM6WTwVhQv uQn5X2xYrsojQQIhCZ+tmZHiQsY68b0ssVU8WKOr9SETs2l6j/Uv5BAB8a66KJgmvP45Ze NnLhcQLJExJRuF4zgjOPFjxwTNzpvMydXI1Xk1dHeFlzT+T9GYTW4JAPhIkC3v5nDDqmco X0AfQiFvpZhOc0ntzaRxACmrWgjocjUD5Ms6bfzoEnE3aMJH+I2vw4Y0Eyn5byBO4A75k0 WnPd/u9bx4ajJUbUhBEk+7SO9VwIHrnnpqNtHCvSuRO1llhvzjxrvhhJKNnFLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921172; a=rsa-sha256; cv=none; b=SOKUTE9CyyTOoQMFeFoGN13p9zxTKoUopPaxqQnykyqwk6kPGMhrVUjjgXEyO+lDdb9fKX XNZlmeDONlIBNbopPfaZfrYrFyV5gHz0Iv15s8LjJOL5ecnTaeLmS6vmGYQMfGfhxgAOdY pAOLNvHVIOaWYAkR5RGTaTjLUAzISu6qghnOewpBUyYN5AyIvc+wjRsrDdN+3lU8KnDkwf gg2uVIqp3f+TujZ75BPSPoaZR5hjOZQlZd5bFJh56JjoyS4+8AmuHPtSJdo+4hmYHRFrX4 cmeMOz/EJu+i2G5a7F9rnpGevEYXWyWS4Mwxpvo1c13q3DDDlj3t1086y9EVxg== 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 4PTJyq6Xb8zZJ9; Sat, 4 Mar 2023 09:12:51 +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 3249CpiP078984; Sat, 4 Mar 2023 09:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249Cpkt078983; Sat, 4 Mar 2023 09:12:51 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:51 GMT Message-Id: <202303040912.3249Cpkt078983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: d447088d9981 - main - linux(4): Improve linux_ifconf readability 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d447088d998107dfff30c3ca801ff778a9030270 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d447088d998107dfff30c3ca801ff778a9030270 commit d447088d998107dfff30c3ca801ff778a9030270 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Improve linux_ifconf readability Initialize max_len and full variables in a code block where they are used. --- sys/compat/linux/linux_ioctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 27cf90b96a71..839c3a61d647 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2185,8 +2185,6 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) error = copyin(uifc, &ifc, sizeof(ifc)); if (error != 0) return (error); - full = 0; - cbs.max_len = maxphys - 1; /* handle the 'request buffer size' case */ if (PTRIN(ifc.ifc_buf) == NULL) { @@ -2196,10 +2194,12 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) NET_EPOCH_EXIT(et); return (copyout(&ifc, uifc, sizeof(ifc))); } - if (ifc.ifc_len <= 0) return (EINVAL); + full = 0; + cbs.max_len = maxphys - 1; + again: if (ifc.ifc_len <= cbs.max_len) { cbs.max_len = ifc.ifc_len;