aacraid(4): Sanely copyin userland pointers and ensure that we don't get
anything janky from a user. (cturt) aac(4): landergriffith+freebsdbugzilla@gmail.com pointed out that aacraid(4) had the same issue and handling of pointers, so let's change that too. PR: 206573 Submitted by: cturt@hardenedbsd.org Obtained from: HardenedBSD MFC after: 1 week
This commit is contained in:
parent
bbea316cc8
commit
f4a18258b0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298280
@ -3103,18 +3103,30 @@ aac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg)
|
|||||||
/* Retrieve correct SG entries. */
|
/* Retrieve correct SG entries. */
|
||||||
if (fibsize == (sizeof(struct aac_srb) +
|
if (fibsize == (sizeof(struct aac_srb) +
|
||||||
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry))) {
|
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry))) {
|
||||||
|
struct aac_sg_entry sg;
|
||||||
|
|
||||||
sge = srbcmd->sg_map.SgEntry;
|
sge = srbcmd->sg_map.SgEntry;
|
||||||
sge64 = NULL;
|
sge64 = NULL;
|
||||||
srb_sg_bytecount = sge->SgByteCount;
|
|
||||||
srb_sg_address = (void *)(uintptr_t)sge->SgAddress;
|
if ((error = copyin(sge, &sg, sizeof(sg))) != 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
srb_sg_bytecount = sg.SgByteCount;
|
||||||
|
srb_sg_address = (void *)(uintptr_t)sg.SgAddress;
|
||||||
}
|
}
|
||||||
#ifdef __amd64__
|
#ifdef __amd64__
|
||||||
else if (fibsize == (sizeof(struct aac_srb) +
|
else if (fibsize == (sizeof(struct aac_srb) +
|
||||||
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) {
|
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) {
|
||||||
|
struct aac_sg_entry64 sg;
|
||||||
|
|
||||||
sge = NULL;
|
sge = NULL;
|
||||||
sge64 = (struct aac_sg_entry64 *)srbcmd->sg_map.SgEntry;
|
sge64 = (struct aac_sg_entry64 *)srbcmd->sg_map.SgEntry;
|
||||||
srb_sg_bytecount = sge64->SgByteCount;
|
|
||||||
srb_sg_address = (void *)sge64->SgAddress;
|
if ((error = copyin(sge64, &sg, sizeof(sg))) != 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
srb_sg_bytecount = sg.SgByteCount;
|
||||||
|
srb_sg_address = (void *)sg.SgAddress;
|
||||||
if (sge64->SgAddress > 0xffffffffull &&
|
if (sge64->SgAddress > 0xffffffffull &&
|
||||||
(sc->flags & AAC_FLAGS_SG_64BIT) == 0) {
|
(sc->flags & AAC_FLAGS_SG_64BIT) == 0) {
|
||||||
error = EINVAL;
|
error = EINVAL;
|
||||||
|
@ -2873,15 +2873,25 @@ aac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg)
|
|||||||
if (fibsize == (sizeof(struct aac_srb) +
|
if (fibsize == (sizeof(struct aac_srb) +
|
||||||
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry))) {
|
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry))) {
|
||||||
struct aac_sg_entry *sgp = srbcmd->sg_map.SgEntry;
|
struct aac_sg_entry *sgp = srbcmd->sg_map.SgEntry;
|
||||||
srb_sg_bytecount = sgp->SgByteCount;
|
struct aac_sg_entry sg;
|
||||||
srb_sg_address = (u_int64_t)sgp->SgAddress;
|
|
||||||
|
if ((error = copyin(sgp, &sg, sizeof(sg))) != 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
srb_sg_bytecount = sg.SgByteCount;
|
||||||
|
srb_sg_address = (u_int64_t)sg.SgAddress;
|
||||||
} else if (fibsize == (sizeof(struct aac_srb) +
|
} else if (fibsize == (sizeof(struct aac_srb) +
|
||||||
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) {
|
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) {
|
||||||
#ifdef __LP64__
|
#ifdef __LP64__
|
||||||
struct aac_sg_entry64 *sgp =
|
struct aac_sg_entry64 *sgp =
|
||||||
(struct aac_sg_entry64 *)srbcmd->sg_map.SgEntry;
|
(struct aac_sg_entry64 *)srbcmd->sg_map.SgEntry;
|
||||||
srb_sg_bytecount = sgp->SgByteCount;
|
struct aac_sg_entry64 sg;
|
||||||
srb_sg_address = sgp->SgAddress;
|
|
||||||
|
if ((error = copyin(sgp, &sg, sizeof(sg))) != 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
srb_sg_bytecount = sg.SgByteCount;
|
||||||
|
srb_sg_address = sg.SgAddress;
|
||||||
if (srb_sg_address > 0xffffffffull &&
|
if (srb_sg_address > 0xffffffffull &&
|
||||||
!(sc->flags & AAC_FLAGS_SG_64BIT))
|
!(sc->flags & AAC_FLAGS_SG_64BIT))
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user