* grub-core/bus/usb/uhci.c (grub_uhci_setup_transfer): Fix possible

NULL pointer dereference.

diff --git a/ChangeLog b/ChangeLog
index 1159d32a5be104703715988398476469e930ab4c..96abe1229421691e9ee8490e24e20bafa073c072 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Szymon Janc <szymon@janc.net.pl>
+
+       * grub-core/bus/usb/uhci.c (grub_uhci_setup_transfer): Fix possible
+       NULL pointer dereference.
+
 2011-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Removed unused GRUB_BOOT_VERSION. Check for kernel version is better

diff --git a/grub-core/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c
index 260b7e8764906b6c0cecccf9f7579b6928d069f9..a9a4c45a203e052aa8400d42b62156c61c9bfe44 100644 (file)
--- a/grub-core/bus/usb/uhci.c
+++ b/grub-core/bus/usb/uhci.c
@@ -544,8 +544,11 @@ grub_uhci_setup_transfer (grub_usb_controller_t dev,
        {
          grub_size_t actual = 0;
          /* Terminate and free.  */
-         td_prev->linkptr2 = 0;
-         td_prev->linkptr = 1;
+         if (td_prev)
+           {
+             td_prev->linkptr2 = 0;
+             td_prev->linkptr = 1;
+           }
 
          if (cdata->td_first)
            grub_free_queue (u, cdata->qh, cdata->td_first, NULL, &actual);