Author: mav
Date: Wed Oct 9 19:26:35 2013
New Revision: 256226
URL: http://svnweb.freebsd.org/changeset/base/256226
Log:
MFC r255304:
Fix kernel panic if cache->nelms is zero.
Modified:
stable/9/sys/cam/scsi/scsi_enc_ses.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_enc_ses.c Wed Oct 9 19:25:22 2013
(r256225)
+++ stable/9/sys/cam/scsi/scsi_enc_ses.c Wed Oct 9 19:26:35 2013
(r256226)
@@ -567,8 +567,8 @@ ses_cache_free_elm_addlstatus(enc_softc_
return;
for (cur_elm = cache->elm_map,
- last_elm = &cache->elm_map[cache->nelms - 1];
- cur_elm <= last_elm; cur_elm++) {
+ last_elm = &cache->elm_map[cache->nelms];
+ cur_elm != last_elm; cur_elm++) {
ses_element_t *elmpriv;
elmpriv = cur_elm->elm_private;
@@ -598,8 +598,8 @@ ses_cache_free_elm_descs(enc_softc_t *en
return;
for (cur_elm = cache->elm_map,
- last_elm = &cache->elm_map[cache->nelms - 1];
- cur_elm <= last_elm; cur_elm++) {
+ last_elm = &cache->elm_map[cache->nelms];
+ cur_elm != last_elm; cur_elm++) {
ses_element_t *elmpriv;
elmpriv = cur_elm->elm_private;
@@ -644,8 +644,8 @@ ses_cache_free_elm_map(enc_softc_t *enc,
ses_cache_free_elm_descs(enc, cache);
ses_cache_free_elm_addlstatus(enc, cache);
for (cur_elm = cache->elm_map,
- last_elm = &cache->elm_map[cache->nelms - 1];
- cur_elm <= last_elm; cur_elm++) {
+ last_elm = &cache->elm_map[cache->nelms];
+ cur_elm != last_elm; cur_elm++) {
ENC_FREE_AND_NULL(cur_elm->elm_private);
}
@@ -717,8 +717,8 @@ ses_cache_clone(enc_softc_t *enc, enc_ca
dst->elm_map = ENC_MALLOCZ(dst->nelms * sizeof(enc_element_t));
memcpy(dst->elm_map, src->elm_map, dst->nelms * sizeof(enc_element_t));
for (dst_elm = dst->elm_map, src_elm = src->elm_map,
- last_elm = &src->elm_map[src->nelms - 1];
- src_elm <= last_elm; src_elm++, dst_elm++) {
+ last_elm = &src->elm_map[src->nelms];
+ src_elm != last_elm; src_elm++, dst_elm++) {
dst_elm->elm_private = ENC_MALLOCZ(sizeof(ses_element_t));
memcpy(dst_elm->elm_private, src_elm->elm_private,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
