From owner-svn-src-stable-11@freebsd.org Sun Apr 23 09:00:28 2017 Return-Path: Delivered-To: svn-src-stable-11@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 0EDD7D4C77C; Sun, 23 Apr 2017 09:00:28 +0000 (UTC) (envelope-from mav@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 mx1.freebsd.org (Postfix) with ESMTPS id DE3F3133; Sun, 23 Apr 2017 09:00:27 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3N90Rtv080628; Sun, 23 Apr 2017 09:00:27 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3N90Rg4080627; Sun, 23 Apr 2017 09:00:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201704230900.v3N90Rg4080627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 23 Apr 2017 09:00:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r317336 - stable/11/sys/dev/usb/storage X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Apr 2017 09:00:28 -0000 Author: mav Date: Sun Apr 23 09:00:26 2017 New Revision: 317336 URL: https://svnweb.freebsd.org/changeset/base/317336 Log: MFC r314254: Update kern_data_resid according to r312291. This now mandatory for correct operation. Modified: stable/11/sys/dev/usb/storage/cfumass.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/storage/cfumass.c ============================================================================== --- stable/11/sys/dev/usb/storage/cfumass.c Sun Apr 23 08:59:57 2017 (r317335) +++ stable/11/sys/dev/usb/storage/cfumass.c Sun Apr 23 09:00:26 2017 (r317336) @@ -720,11 +720,6 @@ cfumass_t_data_out_callback(struct usb_x int actlen, ctl_sg_count; sc = usbd_xfer_softc(xfer); - - CFUMASS_DEBUG(sc, "go"); - - usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); - io = sc->sc_ctl_io; if (io->scsiio.kern_sg_entries > 0) { @@ -741,25 +736,17 @@ cfumass_t_data_out_callback(struct usb_x case USB_ST_TRANSFERRED: CFUMASS_DEBUG(sc, "USB_ST_TRANSFERRED"); - /* - * If the host sent less data than required, zero-out - * the remaining buffer space, to prevent a malicious host - * to writing uninitialized kernel memory to the disk. - */ + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); if (actlen != ctl_sglist[0].len) { KASSERT(actlen <= ctl_sglist[0].len, ("actlen %d > ctl_sglist.len %zd", actlen, ctl_sglist[0].len)); - CFUMASS_DEBUG(sc, "host transferred %d bytes" "instead of expected %zd bytes", actlen, ctl_sglist[0].len); - - memset((char *)(ctl_sglist[0].addr) + actlen, 0, - ctl_sglist[0].len - actlen); } - - sc->sc_current_residue = 0; + sc->sc_current_residue -= actlen; + io->scsiio.kern_data_resid -= actlen; io->scsiio.be_move_done(io); sc->sc_ctl_io = NULL; break; @@ -795,17 +782,18 @@ cfumass_t_data_in_callback(struct usb_xf union ctl_io *io; uint32_t max_bulk; struct ctl_sg_entry ctl_sg_entry, *ctl_sglist; - int ctl_sg_count; + int actlen, ctl_sg_count; sc = usbd_xfer_softc(xfer); - max_bulk = usbd_xfer_max_len(xfer); - io = sc->sc_ctl_io; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: CFUMASS_DEBUG(sc, "USB_ST_TRANSFERRED"); + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); + sc->sc_current_residue -= actlen; + io->scsiio.kern_data_resid -= actlen; io->scsiio.be_move_done(io); sc->sc_ctl_io = NULL; break; @@ -829,12 +817,9 @@ tr_setup: "we will send %ju and stall", sc->sc_current_transfer_length, (uintmax_t)io->scsiio.kern_total_len); - sc->sc_current_residue = sc->sc_current_transfer_length - - io->scsiio.kern_total_len; - } else { - sc->sc_current_residue = 0; } + max_bulk = usbd_xfer_max_len(xfer); CFUMASS_DEBUG(sc, "max_bulk %d, requested size %d, " "CTL segment size %zd", max_bulk, sc->sc_current_transfer_length, ctl_sglist[0].len); @@ -956,8 +941,6 @@ cfumass_datamove(union ctl_io *io) goto fail; } - /* We hadn't received anything during this datamove yet. */ - io->scsiio.ext_data_filled = 0; cfumass_transfer_start(sc, CFUMASS_T_DATA_OUT); } @@ -1028,8 +1011,7 @@ cfumass_init(void) cfumass_port.frontend = &cfumass_frontend; cfumass_port.port_type = CTL_PORT_UMASS; - /* XXX KDM what should the real number be here? */ - cfumass_port.num_requested_ctl_io = 4096; + cfumass_port.num_requested_ctl_io = 1; cfumass_port.port_name = "cfumass"; cfumass_port.physical_port = 0; cfumass_port.virtual_port = 0;