From owner-svn-src-head@freebsd.org Sun Sep 22 16:37:25 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 651F1126A31; Sun, 22 Sep 2019 16:37:25 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46btQs1xKBz3y6Y; Sun, 22 Sep 2019 16:37:25 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qt1-x836.google.com with SMTP id d2so14478412qtr.4; Sun, 22 Sep 2019 09:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Td25cipsASzunWIGUVUX5ipS49BNyTJgm3ST/nmEeLg=; b=dWUG/iBMv4/0z5U8NLg73fVTNbtcciSM8rvCEUqpuE5DyP9VhSgvBtEA9fKb+gaO9y 8AMrjALgoeCccK4CxLSVVxvpYlTRkEmaUQzzhsmac8dtvMYKgJSVpDhK3tU32rvXxvzb kh8QIUZPCA8Jsc18T1uP2uz6hVpRl9IU0zvNavRtjCN3RM3xErqm1dfR5l7zK6RyfwTL j7sIfkm46TCDmOsTXkdrgQSwLcHKWTtY/TwT1tM+sDYQb5TFlbbZVnOQSGMxi9iQ0PG6 UGfdIVOPLoqt9mfGNi6h9vy2jv7wOXevn/AoXiBgkzaF1QowI1QYBkWIjaYJhllLUBnn 2kLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Td25cipsASzunWIGUVUX5ipS49BNyTJgm3ST/nmEeLg=; b=ilQ7Hd7LqpsJTlyIStWAcYrpTXlmnA78YE8gWIg5Kz9mfb7O772hvCVY/kiAU9kRx6 DOaTKTqjCVjh1QjlAwb+Tf5BWD0nXLks68YZWB1dHVTt25gjpvsJ7qZzPPlMIiVfx4BM XUl5U7uscly8ftw66zaJx7YU4ERXojXJew7hfFb4PSU50sRET/04/javi7A3ao8C3IUq QmSdVB7erGNI2wbK6kcIoDTsznl7kk9LiBSk6DhfNlRatyCdtc7Br74LxX5o/3NFjIV+ wKfPDDkcLpswPCB3uU85WNn14rkO8xxFe34v+JJSVA10L4BvvOkBLywfk8ojUl9UT6bf vN8A== X-Gm-Message-State: APjAAAVdLFgILN8fQ8mb/1cZ1Ppd81De7pyG3fx8NHuaigS7vxzGy8M8 eoiB/ogVh+1a+BccYg/ZXJ5eL+sXgzxlGfhlALmJeA== X-Google-Smtp-Source: APXvYqzm+lhu1n8kXFYe8xrmuzZNmg9DkpXqJmBFqSBoM+s3iOZdEG2DDq10hB4lYmbpeSXdmmL0V0uI70jClXjK3EU= X-Received: by 2002:ac8:34d8:: with SMTP id x24mr13559854qtb.353.1569170243595; Sun, 22 Sep 2019 09:37:23 -0700 (PDT) MIME-Version: 1.0 References: <201909212003.x8LK3HFK021501@repo.freebsd.org> In-Reply-To: <201909212003.x8LK3HFK021501@repo.freebsd.org> From: Ryan Stone Date: Sun, 22 Sep 2019 12:37:12 -0400 Message-ID: Subject: Re: svn commit: r352585 - head/sys/kern To: Konstantin Belousov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 46btQs1xKBz3y6Y X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2019 16:37:25 -0000 Thanks! On Sat, Sep 21, 2019 at 4:03 PM Konstantin Belousov wrote: > > Author: kib > Date: Sat Sep 21 20:03:17 2019 > New Revision: 352585 > URL: https://svnweb.freebsd.org/changeset/base/352585 > > Log: > kern.elf{32,64}.pie_base sysctl: enforce page alignment. > > Requested by: rstone > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > > Modified: > head/sys/kern/imgact_elf.c > > Modified: head/sys/kern/imgact_elf.c > ============================================================================== > --- head/sys/kern/imgact_elf.c Sat Sep 21 19:51:57 2019 (r352584) > +++ head/sys/kern/imgact_elf.c Sat Sep 21 20:03:17 2019 (r352585) > @@ -136,8 +136,24 @@ SYSCTL_INT(_kern_elf32, OID_AUTO, read_exec, CTLFLAG_R > #endif > > static u_long __elfN(pie_base) = ET_DYN_LOAD_ADDR; > -SYSCTL_ULONG(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, pie_base, > - CTLFLAG_RWTUN, &__elfN(pie_base), 0, > +static int > +sysctl_pie_base(SYSCTL_HANDLER_ARGS) > +{ > + u_long val; > + int error; > + > + val = __elfN(pie_base); > + error = sysctl_handle_long(oidp, &val, 0, req); > + if (error != 0 || req->newptr == NULL) > + return (error); > + if ((val & PAGE_MASK) != 0) > + return (EINVAL); > + __elfN(pie_base) = val; > + return (0); > +} > +SYSCTL_PROC(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, pie_base, > + CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, > + sysctl_pie_base, "LU", > "PIE load base without randomization"); > > SYSCTL_NODE(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, aslr, CTLFLAG_RW, 0,