From owner-svn-src-all@freebsd.org Mon Nov 25 22:21:51 2019 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 892811BBF54; Mon, 25 Nov 2019 22:21:51 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) (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 47MM2l36RWz41QR; Mon, 25 Nov 2019 22:21:51 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: by mail-qt1-x844.google.com with SMTP id i17so19129415qtq.1; Mon, 25 Nov 2019 14:21:51 -0800 (PST) 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=/9FaorgoTV9hwzzXMvyzusEr+jirNQWYzpDgMrDw8dI=; b=riW/He1CPuyW3+uLA7ttczQZ5n47mkotCHxO+DpteEc/vSYzlpiwgkGEzOJn/oRGq6 W9gKZyQwa/ztfybT7T2C17GjF6/s61Xo2eQHHxJ9U7Ev6ZP0Uw5yEuqr2z5wUnPzhl5D NnfPhQ6t3RWAiyQZJdluF8rCzWJQ2WS/WfevTsEvJsIgTEqEh+Xp5mgSQzqhlm5xj2Dm XeRzG88q7TCq422aEnc1QuemBB0hCIlLeHxsgZ1s0hzUePaUlaA/24vxc6Y3cqoDN0lq YJ3UFUtzGa7kupTm0RIBHx28QHSH51b9z9FU3tNyzIsFY2lVPznvFSBIRz3RR1mykx7X F5Bg== 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=/9FaorgoTV9hwzzXMvyzusEr+jirNQWYzpDgMrDw8dI=; b=k7F5vvbzB693/rYuWBUvwrQzfD4VlzBfJoml8hK72paLxtoJ07TFzMuRjAqeTyqFXH R9sbo8WDAKvQ2XgvbxrBgmqTut75bWnO8m5+EHJpIlHzDE0XIVvnp1IHqJSQtKy+mOzk Xnq7IuTvKk09f9L+KX7PHOPBAHqkQW2x6HFrK6zQb1e//DMnQum3DmKVS3jixMKs+zRK 3m71vUHv03rA/3Axl/sV1VUW5ghaJUFoMPQB4PcPL4RwxtI//x9mBZl+96lwqu4gfXkv rAdnWfTK1PFl5iKa5apbMoleXShB5DOGOzhsdVCGksdfusVHBneziyDzFuIXYSnL5LSm OHqQ== X-Gm-Message-State: APjAAAU4ucWprCUKmLPHvXma0H+awzsn2e02CF2JTKS3DT12QsUMMyA3 90msK45FMp4GDhCNZyfLTWMaRQvZ6ZlcI3px7R9rsSUm X-Google-Smtp-Source: APXvYqxiXJYex5MHSy/ELxInq8YUhaJhrYUwkUGYHzGsdQj0JWAstTAGkq11kelX6Nhec6qujoOIPRjre0MB9mXRW1I= X-Received: by 2002:ac8:41c7:: with SMTP id o7mr31517516qtm.262.1574720507272; Mon, 25 Nov 2019 14:21:47 -0800 (PST) MIME-Version: 1.0 References: <201911252121.xAPLLbpN041510@repo.freebsd.org> In-Reply-To: <201911252121.xAPLLbpN041510@repo.freebsd.org> From: Ryan Libby Date: Mon, 25 Nov 2019 14:21:35 -0800 Message-ID: Subject: Re: svn commit: r355101 - head/sys/dev/cfi To: Ed Maste Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47MM2l36RWz41QR X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-0.996,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: Mon, 25 Nov 2019 22:21:51 -0000 On Mon, Nov 25, 2019 at 1:21 PM Ed Maste wrote: > > Author: emaste > Date: Mon Nov 25 21:21:37 2019 > New Revision: 355101 > URL: https://svnweb.freebsd.org/changeset/base/355101 > > Log: > cfi: check for inter overflow in cfi_devioctl > > Reported by: Pietro Oliva > Reviewed by: markj > MFC after: 3 days > Security: Possible OOB read in root-only ioctl > Sponsored by: The FreeBSD Foundation > > Modified: > head/sys/dev/cfi/cfi_dev.c > > Modified: head/sys/dev/cfi/cfi_dev.c > ============================================================================== > --- head/sys/dev/cfi/cfi_dev.c Mon Nov 25 19:59:53 2019 (r355100) > +++ head/sys/dev/cfi/cfi_dev.c Mon Nov 25 21:21:37 2019 (r355101) > @@ -280,7 +280,8 @@ cfi_devioctl(struct cdev *dev, u_long cmd, caddr_t dat > rq = (struct cfiocqry *)data; > if (rq->offset >= sc->sc_size / sc->sc_width) > return (ESPIPE); > - if (rq->offset + rq->count > sc->sc_size / sc->sc_width) > + if (rq->offset > ULONG_MAX - rq->count || > + rq->offset + rq->count > sc->sc_size / sc->sc_width) > return (ENOSPC); > > while (!error && rq->count--) { > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" This seems to have broken the some builds. Need sys/limits.h.