cryptosoft: Remove a dead store
Introduced in r331639 by removing an instance of undefined behavior. While we're here, the variable scope can be entirely moved inside the loop. Reported by: Coverity CID: 1387985 Sponsored by: Dell EMC Isilon
This commit is contained in:
parent
526de79be2
commit
5d7ae54a5d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=331959
@ -84,7 +84,7 @@ static int
|
|||||||
swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
|
swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
|
||||||
int flags)
|
int flags)
|
||||||
{
|
{
|
||||||
unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN], *idat;
|
unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN];
|
||||||
unsigned char *ivp, *nivp, iv2[EALG_MAX_BLOCK_LEN];
|
unsigned char *ivp, *nivp, iv2[EALG_MAX_BLOCK_LEN];
|
||||||
struct enc_xform *exf;
|
struct enc_xform *exf;
|
||||||
int i, j, k, blks, ind, count, ivlen;
|
int i, j, k, blks, ind, count, ivlen;
|
||||||
@ -249,11 +249,12 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (uio->uio_iov[ind].iov_len >= k + blks && i > 0) {
|
while (uio->uio_iov[ind].iov_len >= k + blks && i > 0) {
|
||||||
|
uint8_t *idat;
|
||||||
size_t nb, rem;
|
size_t nb, rem;
|
||||||
|
|
||||||
nb = blks;
|
nb = blks;
|
||||||
rem = uio->uio_iov[ind].iov_len - k;
|
rem = uio->uio_iov[ind].iov_len - k;
|
||||||
idat = (char *)uio->uio_iov[ind].iov_base + k;
|
idat = (uint8_t *)uio->uio_iov[ind].iov_base + k;
|
||||||
|
|
||||||
if (exf->reinit) {
|
if (exf->reinit) {
|
||||||
if ((crd->crd_flags & CRD_F_ENCRYPT) != 0 &&
|
if ((crd->crd_flags & CRD_F_ENCRYPT) != 0 &&
|
||||||
@ -296,7 +297,6 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
|
|||||||
ivp = nivp;
|
ivp = nivp;
|
||||||
}
|
}
|
||||||
|
|
||||||
idat += nb;
|
|
||||||
count += nb;
|
count += nb;
|
||||||
k += nb;
|
k += nb;
|
||||||
i -= nb;
|
i -= nb;
|
||||||
|
Loading…
Reference in New Issue
Block a user