From owner-svn-src-head@freebsd.org Thu Sep 22 17:58:39 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A135BE5A39 for ; Thu, 22 Sep 2016 17:58:39 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1F6AFFB8 for ; Thu, 22 Sep 2016 17:58:39 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x22a.google.com with SMTP id w84so267379994wmg.1 for ; Thu, 22 Sep 2016 10:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=akkFvU7huBkXZZ/TcjtV0tAVp1BtIVvQvI5wjw8NhTs=; b=gZho2qlCC38/to5aVUm4EYoEISdSRUe9l/B4X34eNV4sXHx7J543VW2657hkTvMcwJ LrBF3eH6zWBBZ+2UUlNdUaqKuH7u37dj5LsFMsP7A90jJz5RyTZdL3d1HdMyDzMHBpNy GlVqPD/Z+CXUFGpKyKbXJRGJNIll7M3m4pMJ1QXwyZHEp/lUcZZ7PTfQA5I3ATZFpwK1 /igrIp2WA7FNOOv0UZFjlOk7FqeBgTcGYsWHx57MMUnoPpKOZgheUujeAVsy/osqQTaK HktRpSIfHJBrcIakIGBfHQe1xvESzXLLZvdtaeYuxf4JfGrR5osext7523rR2kCznt7u UmIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=akkFvU7huBkXZZ/TcjtV0tAVp1BtIVvQvI5wjw8NhTs=; b=BSSesWErygeONLFyww8RfgE6Le088Q0TkIu0dQJoY19atK9IRtYMQ04AsLMy+mypwf qJFSLC2kO0gNPdYHpmHYW1B6nJlPfKCAKCYCq9e9OeLX6c7zbspVK6y2mp+BBj403qtr jsmFhk6f86HPnFlFkt3A/ATzlvj/TJy5B+appCQqHMQPc/AbYTxX0nsEp5B7j0jY+mcJ k8OSYk70tPS20qb9SsbmEJISeX0teyVMXvEweIWZLlP+U+q51uwaaQc7OcfB11K1Ra3L t+anXO5GF2T97mCHB/O4/2BZe3Ux4R5N9956c65YMRw5Eux8uosXuhDR1uOoil2eqYU7 YrSA== X-Gm-Message-State: AE9vXwN2TtPGfkHO3PphON8BuGfDRAgpVJun480NEL7yFtFNLcZQD9VbkqigiM35lLNBZyPTfm9pGbu8Ep6a3HNp X-Received: by 10.194.103.3 with SMTP id fs3mr3105694wjb.115.1474567117528; Thu, 22 Sep 2016 10:58:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.139.208 with HTTP; Thu, 22 Sep 2016 10:58:37 -0700 (PDT) In-Reply-To: <201608041755.u74HtNc6040224@repo.freebsd.org> References: <201608041755.u74HtNc6040224@repo.freebsd.org> From: Oliver Pinter Date: Thu, 22 Sep 2016 19:58:37 +0200 Message-ID: Subject: Re: svn commit: r303753 - head/sys/amd64/amd64 To: John Baldwin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Thu, 22 Sep 2016 17:58:39 -0000 Hi! Do you plan to MFC this change to 10-STABLE? On Thu, Aug 4, 2016 at 7:55 PM, John Baldwin wrote: > Author: jhb > Date: Thu Aug 4 17:55:23 2016 > New Revision: 303753 > URL: https://svnweb.freebsd.org/changeset/base/303753 > > Log: > Don't permit mappings of invalid physical addresses on amd64 via /dev/mem. > > Discussed with: kib > > Modified: > head/sys/amd64/amd64/mem.c > > Modified: head/sys/amd64/amd64/mem.c > ============================================================================== > --- head/sys/amd64/amd64/mem.c Thu Aug 4 17:46:07 2016 (r303752) > +++ head/sys/amd64/amd64/mem.c Thu Aug 4 17:55:23 2016 (r303753) > @@ -168,9 +168,11 @@ int > memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, > int prot __unused, vm_memattr_t *memattr __unused) > { > - if (dev2unit(dev) == CDEV_MINOR_MEM) > + if (dev2unit(dev) == CDEV_MINOR_MEM) { > + if (offset >= (1ULL << cpu_maxphyaddr)) > + return (-1); > *paddr = offset; > - else if (dev2unit(dev) == CDEV_MINOR_KMEM) > + } else if (dev2unit(dev) == CDEV_MINOR_KMEM) > *paddr = vtophys(offset); > /* else panic! */ > return (0); > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"