From owner-svn-src-all@freebsd.org Tue Feb 26 15:06:46 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF36D151C1CB; Tue, 26 Feb 2019 15:06:45 +0000 (UTC) (envelope-from markj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 97AC98970D; Tue, 26 Feb 2019 15:06:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 830016D17; Tue, 26 Feb 2019 15:06:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1QF6jEP077317; Tue, 26 Feb 2019 15:06:45 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1QF6jI0077316; Tue, 26 Feb 2019 15:06:45 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201902261506.x1QF6jI0077316@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 26 Feb 2019 15:06:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r344584 - stable/11/sys/geom X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/geom X-SVN-Commit-Revision: 344584 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 97AC98970D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.984,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2019 15:06:46 -0000 Author: markj Date: Tue Feb 26 15:06:44 2019 New Revision: 344584 URL: https://svnweb.freebsd.org/changeset/base/344584 Log: MFC r344305, r344365: Impose a limit on the number of GEOM_CTL arguments. admbug: 854 Modified: stable/11/sys/geom/geom_ctl.c stable/11/sys/geom/geom_ctl.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/geom/geom_ctl.c ============================================================================== --- stable/11/sys/geom/geom_ctl.c Tue Feb 26 15:03:59 2019 (r344583) +++ stable/11/sys/geom/geom_ctl.c Tue Feb 26 15:06:44 2019 (r344584) @@ -137,6 +137,12 @@ gctl_copyin(struct gctl_req *req) char *p; u_int i; + if (req->narg > GEOM_CTL_ARG_MAX) { + gctl_error(req, "too many arguments"); + req->arg = NULL; + return; + } + ap = geom_alloc_copyin(req, req->arg, req->narg * sizeof(*ap)); if (ap == NULL) { gctl_error(req, "bad control request"); Modified: stable/11/sys/geom/geom_ctl.h ============================================================================== --- stable/11/sys/geom/geom_ctl.h Tue Feb 26 15:03:59 2019 (r344583) +++ stable/11/sys/geom/geom_ctl.h Tue Feb 26 15:06:44 2019 (r344584) @@ -76,7 +76,8 @@ struct gctl_req { #define GEOM_CTL _IOW('G', GCTL_VERSION, struct gctl_req) -#define PATH_GEOM_CTL "geom.ctl" +#define GEOM_CTL_ARG_MAX 2048 /* maximum number of parameters */ +#define PATH_GEOM_CTL "geom.ctl" #endif /* _GEOM_GEOM_CTL_H_ */