diff options
| author | brutus <none@none> | 2008-04-21 16:11:10 -0700 |
|---|---|---|
| committer | brutus <none@none> | 2008-04-21 16:11:10 -0700 |
| commit | 1e1fedba29f2d95e0defbb93d1ac3da48c89b992 (patch) | |
| tree | bf2f8f108320a040f8a8f551c62831c7bd05249a /usr/src/uts/common/os/streamio.c | |
| parent | aa7d6a5edd8ec1d206c08c2ebaee7fcfb06817e6 (diff) | |
| download | illumos-gate-1e1fedba29f2d95e0defbb93d1ac3da48c89b992.tar.gz | |
6691271 putback for 6567008/6582323/6582330/6582335 causes kernel panic
Diffstat (limited to 'usr/src/uts/common/os/streamio.c')
| -rw-r--r-- | usr/src/uts/common/os/streamio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c index 53e2d81465..ffc877dc44 100644 --- a/usr/src/uts/common/os/streamio.c +++ b/usr/src/uts/common/os/streamio.c @@ -7358,7 +7358,7 @@ retry: if (uiop == NULL) { /* Append data to tail of mctlp */ - ASSERT(!(bp->b_datap->db_flags & DBLK_UIOA)); + ASSERT(bp == NULL || !(bp->b_datap->db_flags & DBLK_UIOA)); if (mctlp != NULL) { mblk_t **mpp = mctlp; @@ -7367,7 +7367,7 @@ retry: *mpp = bp; bp = NULL; } - } else if (bp->b_datap->db_flags & DBLK_UIOA) { + } else if (bp && (bp->b_datap->db_flags & DBLK_UIOA)) { /* * A uioa mblk_t chain, as uio processing has already * been done we simple skip over processing. |