From owner-svn-src-head@freebsd.org Wed Dec 18 18:44:17 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 5DF481E4737; Wed, 18 Dec 2019 18:44:17 +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 47dP751qY2z4shg; Wed, 18 Dec 2019 18:44:17 +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 39DC125A0; Wed, 18 Dec 2019 18:44:17 +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 xBIIiHKI097526; Wed, 18 Dec 2019 18:44:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBIIiHiw097524; Wed, 18 Dec 2019 18:44:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201912181844.xBIIiHiw097524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 18 Dec 2019 18:44:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355885 - head/sys/dev/oce X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/dev/oce X-SVN-Commit-Revision: 355885 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 18 Dec 2019 18:44:17 -0000 Author: markj Date: Wed Dec 18 18:44:16 2019 New Revision: 355885 URL: https://svnweb.freebsd.org/changeset/base/355885 Log: oce: Tighten input validation in the SIOCGI2C handler. Missing validation meant that it was possible to read 8 bytes beyond the end of sfp_vpd_dump_buffer. Reported by: Ilja Van Sprundel Reviewed by: delphij, ram MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D22859 Modified: head/sys/dev/oce/oce_if.c Modified: head/sys/dev/oce/oce_if.c ============================================================================== --- head/sys/dev/oce/oce_if.c Wed Dec 18 18:43:44 2019 (r355884) +++ head/sys/dev/oce/oce_if.c Wed Dec 18 18:44:16 2019 (r355885) @@ -593,27 +593,26 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t d if (rc) break; - if (i2c.dev_addr != PAGE_NUM_A0 && - i2c.dev_addr != PAGE_NUM_A2) { + if (i2c.dev_addr == PAGE_NUM_A0) { + offset = i2c.offset; + } else if (i2c.dev_addr == PAGE_NUM_A2) { + offset = TRANSCEIVER_A0_SIZE + i2c.offset; + } else { rc = EINVAL; break; } - if (i2c.len > sizeof(i2c.data)) { + if (i2c.len > sizeof(i2c.data) || + i2c.len + offset > sizeof(sfp_vpd_dump_buffer)) { rc = EINVAL; break; } rc = oce_mbox_read_transrecv_data(sc, i2c.dev_addr); - if(rc) { + if (rc) { rc = -rc; break; } - - if (i2c.dev_addr == PAGE_NUM_A0) - offset = i2c.offset; - else - offset = TRANSCEIVER_A0_SIZE + i2c.offset; memcpy(&i2c.data[0], &sfp_vpd_dump_buffer[offset], i2c.len);