Date: Fri, 26 Aug 2011 23:05:34 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r225205 - projects/zfsd/head/sys/cam/scsi Message-ID: <201108262305.p7QN5YHb074543@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Aug 26 23:05:34 2011 New Revision: 225205 URL: http://svn.freebsd.org/changeset/base/225205 Log: Report proper zero length when no descriptor available for element. Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Fri Aug 26 22:33:41 2011 (r225204) +++ projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Fri Aug 26 23:05:34 2011 (r225205) @@ -2606,8 +2606,10 @@ ses_get_elm_desc(enc_softc_t *enc, encio /* Assume caller has already checked obj_id validity */ elmpriv = enc->enc_cache.elm_map[i].elm_private; /* object might not have a descriptor */ - if (elmpriv == NULL || elmpriv->descr == NULL) + if (elmpriv == NULL || elmpriv->descr == NULL) { + elmd->elm_desc_len = 0; return (0); + } if (elmd->elm_desc_len > elmpriv->descr_len) elmd->elm_desc_len = elmpriv->descr_len; copyout(elmpriv->descr, elmd->elm_desc_str, elmd->elm_desc_len);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108262305.p7QN5YHb074543>