Module Name: src
Committed By: martin
Date: Fri Apr 3 12:27:56 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-9]: usbdi.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.182.4.3 -r1.182.4.4 src/sys/dev/usb/usbdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.182.4.3 src/sys/dev/usb/usbdi.c:1.182.4.4
--- src/sys/dev/usb/usbdi.c:1.182.4.3 Sun Mar 1 12:35:16 2020
+++ src/sys/dev/usb/usbdi.c Fri Apr 3 12:27:55 2020
@@ -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 @@ usbd_create_xfer(struct usbd_pipe *pipe,
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 @@ usbd_create_xfer(struct usbd_pipe *pipe,
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;
}
