From owner-svn-src-all@freebsd.org Thu May 28 02:41:06 2020 Return-Path: Delivered-To: svn-src-all@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 2D38E2FABE2; Thu, 28 May 2020 02:41:06 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49XX4x5LYkz4fTn; Thu, 28 May 2020 02:41:05 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-io1-xd2b.google.com with SMTP id s18so14429319ioe.2; Wed, 27 May 2020 19:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rbIB1ICcMwYSnXaBx99pse+Ac7m+RkjEQ1EAP4GtUa4=; b=slI5bEUTC9pNnLSDSY8eigA3FJ9khkhp+iHJvHZxY1vxEuVVO9CH9u1UaKH1llfaCs 6qXETpHTAWcRMvPvuLVoRpIyH0EL9Bc5MBpls06TgLNXSzvVtQIKtA962iRRQKethbpw EyEM849DYejk42tqUqACHK0pq58+25l8SiMDjEtcQh8j5274jhfmwKzSxxp+waSYjpL/ 6s50xP1ohiP+/KuAjWWdEXnshCimFmqqnT5hJvueVln6F0/AXKkbmRF+cbtNttCgIkSj JRvgjsqpYI7URR++AH7aAGNjoO2N7ef6qGncrkAhK5FekpfAnP8d71eL3vg1A7Y9UrDW QQaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rbIB1ICcMwYSnXaBx99pse+Ac7m+RkjEQ1EAP4GtUa4=; b=RF606de6ENdYLmycS6orhi3ct+FApri5Tg1Oym3WP7/wwH/9tisZKbhMcfIvMYfoH3 nGuTjZ7/8jnYx1TgnTb1h2/TRheM3ZwPVqfwHgNvVlQ8q3t1eeRf3kpk7OJq2dT0Grda 5TQYKj4Asd3pTCOrWBzsirpsH/Yqhsfpy2BSmiKXNTPCUExfAFtMSEB3UFsXvKJZVuNp 6kY7koMlHNwbAfVpj3HZXKEtPTkxf6eVyMdvGMf848TDd+k/1MXBJDSfbJndkryvYyxo K6ICnajt5PVyCi+XK87/jDmxCxGQQy0RpD750ijVUAskKeW7bdZ+F32/EsCpc0ABPEjE XbHA== X-Gm-Message-State: AOAM532g30zAg17TTc1unWc5U8woKKnpAX27SK3p2aOaHHjLayP5nq4x LEYS+bYrCsLmGNT1KomqE6stUxlUo0cl5Q== X-Google-Smtp-Source: ABdhPJzqN4rkgOA4XxAUkYidkFEc+F/6NONuKm+kltF//da9OpE8vDU/eP0OjRGz8IBz3SUTacTDjg== X-Received: by 2002:a05:6638:10b:: with SMTP id x11mr185481jao.109.1590633664167; Wed, 27 May 2020 19:41:04 -0700 (PDT) Received: from titan.knownspace (173-19-125-130.client.mchsi.com. [173.19.125.130]) by smtp.gmail.com with ESMTPSA id h15sm111635iol.9.2020.05.27.19.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 19:41:03 -0700 (PDT) Date: Wed, 27 May 2020 21:41:01 -0500 From: Justin Hibbits To: Brandon Bergren Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361568 - head/sys/powerpc/aim Message-ID: <20200527214101.59293529@titan.knownspace> In-Reply-To: <202005280049.04S0n3jS096937@repo.freebsd.org> References: <202005280049.04S0n3jS096937@repo.freebsd.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; powerpc64-portbld-freebsd13.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49XX4x5LYkz4fTn X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Thu, 28 May 2020 02:41:06 -0000 On Thu, 28 May 2020 00:49:03 +0000 (UTC) Brandon Bergren wrote: > Author: bdragon > Date: Thu May 28 00:49:02 2020 > New Revision: 361568 > URL: https://svnweb.freebsd.org/changeset/base/361568 > > Log: > [PowerPC] Fix radix crash when passing -1 from userspace > > Found by running libc tests with radix enabled. > > Detect unsigned integer wrapping with a postcondition. > > Note: Radix MMU is not enabled by default yet. > > Sponsored by: Tag1 Consulting, Inc. > > Modified: > head/sys/powerpc/aim/mmu_radix.c > > Modified: head/sys/powerpc/aim/mmu_radix.c > ============================================================================== > --- head/sys/powerpc/aim/mmu_radix.c Wed May 27 23:20:35 > 2020 (r361567) +++ head/sys/powerpc/aim/mmu_radix.c Thu > May 28 00:49:02 2020 (r361568) @@ -6000,7 +6000,8 @@ > mmu_radix_kremove(vm_offset_t va) int mmu_radix_map_user_ptr(pmap_t > pm, volatile const void *uaddr, void **kaddr, size_t ulen, size_t > *klen) { > - if ((uintptr_t)uaddr + ulen >= VM_MAXUSER_ADDRESS) > + if ((uintptr_t)uaddr + ulen >= VM_MAXUSER_ADDRESS || > + (uintptr_t)uaddr + ulen < (uintptr_t)uaddr) > return (EFAULT); > > *kaddr = (void *)(uintptr_t)uaddr; Wouldn't if ((uintptr_t)uaddr >= VM_MAXUSER_ADDRESS || (uintptr_t)uaddr + ulen >= VM_MAXUSER_ADDRESS) be more appropriate? - Justin