[src/netbsd-9]: src/sys/dev/usb Pull up following revision(s) (requested by s...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee9f1ef5f387
branches:  netbsd-9
changeset: 746514:ee9f1ef5f387
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Apr 03 12:27:55 2020 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #819):

        sys/dev/usb/usbdi.c: revision 1.199

Avoid crashes if we fail to allocate a transfer buffer and avoid an
unnecessary usbd_free_buffer before usbd_free_xfer

Worked out by Riastradh

diffstat:

 sys/dev/usb/usbdi.c |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 99a4db386108 -r ee9f1ef5f387 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Thu Apr 02 19:24:39 2020 +0000
+++ b/sys/dev/usb/usbdi.c       Fri Apr 03 12:27:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.182.4.3 2020/03/01 12:35:16 martin Exp $   */
+/*     $NetBSD: usbdi.c,v 1.182.4.4 2020/04/03 12:27:55 martin Exp $   */
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.3 2020/03/01 12:35:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.4 2020/04/03 12:27:55 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -523,6 +523,11 @@
        if (xfer == NULL)
                return ENOMEM;
 
+       xfer->ux_pipe = pipe;
+       xfer->ux_flags = flags;
+       xfer->ux_nframes = nframes;
+       xfer->ux_methods = pipe->up_methods;
+
        if (len) {
                buf = usbd_alloc_buffer(xfer, len);
                if (!buf) {
@@ -530,16 +535,10 @@
                        return ENOMEM;
                }
        }
-       xfer->ux_pipe = pipe;
-       xfer->ux_flags = flags;
-       xfer->ux_nframes = nframes;
-       xfer->ux_methods = pipe->up_methods;
 
        if (xfer->ux_methods->upm_init) {
                int err = xfer->ux_methods->upm_init(xfer);
                if (err) {
-                       if (buf)
-                               usbd_free_buffer(xfer);
                        usbd_free_xfer(xfer);
                        return err;
                }