upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-29 01:59:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ses: Add error checking for copyout() calls

Browse source 
This is in preparation for annotating copyin() and related functions
with __result_use_check.

Reviewed by:	mav, imp, asomers
Tested by:	asomers
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D43130

(cherry picked from commit 771501e96ffd7e314c338300a351ad76d28a2f69)
This commit is contained in:
Mark Johnston 2023-12-25 20:40:33 -05:00
parent eb5a0f6271
commit cd4fa92589
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/cam/scsi/scsi_enc_ses.c
View file

@ -2811,8 +2811,8 @@ ses_get_elm_desc(enc_softc_t *enc, encioc_elm_desc_t *elmd)
}
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);
return (0);
return (copyout(elmpriv->descr, elmd->elm_desc_str,
elmd->elm_desc_len));
}
/**
@ -2828,7 +2828,7 @@ static int
ses_get_elm_devnames(enc_softc_t *enc, encioc_elm_devnames_t *elmdn)
{
struct sbuf sb;
int len;
int error, len;
len = elmdn->elm_names_size;
if (len < 0)
@ -2840,10 +2840,13 @@ ses_get_elm_devnames(enc_softc_t *enc, encioc_elm_devnames_t *elmdn)
ses_elmdevname_callback, &sb);
sbuf_finish(&sb);
elmdn->elm_names_len = sbuf_len(&sb);
copyout(sbuf_data(&sb), elmdn->elm_devnames, elmdn->elm_names_len + 1);
error = copyout(sbuf_data(&sb), elmdn->elm_devnames,
elmdn->elm_names_len + 1);
sbuf_delete(&sb);
cam_periph_lock(enc->periph);
return (elmdn->elm_names_len > 0 ? 0 : ENODEV);
if (error == 0 && elmdn->elm_names_len == 0)
error = ENODEV;
return (error);
}
/**
@ -2922,9 +2925,9 @@ ses_handle_string(enc_softc_t *enc, encioc_string_t *sstr, unsigned long ioc)
size = rsize;
if (size > sstr->bufsiz)
size = sstr->bufsiz;
copyout(str, sstr->buf, size);
ret = copyout(str, sstr->buf, size);
sstr->bufsiz = rsize;
return (size == rsize ? 0 : ENOMEM);
return (ret != 0 ? ret : (size == rsize ? 0 : ENOMEM));
case ENCIOC_GETENCID:
if (ses_cache->ses_nsubencs < 1)
return (ENODEV);
@ -2936,9 +2939,9 @@ ses_handle_string(enc_softc_t *enc, encioc_string_t *sstr, unsigned long ioc)
size = rsize;
if (size > sstr->bufsiz)
size = sstr->bufsiz;
copyout(str, sstr->buf, size);
ret = copyout(str, sstr->buf, size);
sstr->bufsiz = rsize;
return (size == rsize ? 0 : ENOMEM);
return (ret != 0 ? ret : (size == rsize ? 0 : ENOMEM));
default:
return (EINVAL);
}