Attachment 185350 Details for Bug 205903 – SUGGESTED PATCH: prevent rm_free_unused_clients from being called with null pointer.

[patch] SUGGESTED PATCH: prevent rm_free_unused_clients from being called with null pointer.

patch-bug-195097 (text/plain), 1.02 KB, created by Anonymized Account on 2017-08-13 08:28:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymized Account

Created: 2017-08-13 08:28:46 UTC

Size: 1.02 KB

patch

obsolete

>--- src/nvidia_subr.c.orig	2017-01-17 00:57:56.000000000 +0500
>+++ src/nvidia_subr.c	2017-08-10 23:33:44.502830000 +0500
>@@ -489,7 +489,11 @@
>     nv_stack_t *sp;
> 
>     sp = sc->api_sp;
>-    rm_free_unused_clients(sp, nv, filep);
>+    if (sp != NULL) {
>+        rm_free_unused_clients(sp, nv, filep);
>+    } else {
>+        device_printf(sc->dev, "Crash prevented in nvidia_close_ctl() (FreeBSD bug 195097).\n");
>+    }
> 
>     if (--sc->refcnt == 0) {
>         NV_UMA_ZONE_FREE_STACK(sc->api_sp);
>@@ -594,9 +599,15 @@
> 
>     sc = nv->os_state;
>     sp = sc->api_sp;
>+    /* If nvidia_open_dev failed and we're called from nvidia_dev_dtor, we
>+     * already released api_sp. */
> 
>     NV_PCI_CHECK_CONFIG_SPACE(sp, nv, TRUE, TRUE, TRUE);
>-    rm_free_unused_clients(sp, nv, filep);
>+    if (sp != NULL) {
>+        rm_free_unused_clients(sp, nv, filep);
>+    } else {
>+        device_printf(sc->dev, "Crash prevented in nvidia_close_dev() (FreeBSD bug 195097).\n");
>+    }
> 
>     if (--sc->refcnt == 0) {
>         if (sc->UD_object != NULL)

Actions: View | Diff

Attachments on bug 205903: 165080 | 165081 | 170497 | 170498 | 170499 | 170501 | 177275 | 185350