[rtems commit] b1553brm.c: Fix Dereference before null check (CID #1399829 )

Joel Sherrill joel at rtems.org
Fri Feb 19 20:06:08 UTC 2021


Module:    rtems
Branch:    master
Commit:    eff3d7c05f71a60e93a67b08168f5f64b747c56d
Changeset: http://git.rtems.org/rtems/commit/?id=eff3d7c05f71a60e93a67b08168f5f64b747c56d

Author:    Ryan Long <ryan.long at oarcorp.com>
Date:      Tue Feb 16 16:20:04 2021 -0500

b1553brm.c: Fix Dereference before null check (CID #1399829)

CID 1399829: Dereference before null check in brm_control().

Closes #4250

---

 bsps/shared/grlib/1553/b1553brm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bsps/shared/grlib/1553/b1553brm.c b/bsps/shared/grlib/1553/b1553brm.c
index 57ef701..694f585 100644
--- a/bsps/shared/grlib/1553/b1553brm.c
+++ b/bsps/shared/grlib/1553/b1553brm.c
@@ -994,8 +994,8 @@ static rtems_device_driver brm_control(rtems_device_major_number major, rtems_de
 	unsigned int i=0;
 	unsigned short ctrl, oper, cw1, cw2;
 	rtems_libio_ioctl_args_t *ioarg = (rtems_libio_ioctl_args_t *) arg;
-	unsigned int *data = ioarg->buffer;
-	struct bc_msg *cmd_list = (struct bc_msg *) ioarg->buffer;
+	unsigned int *data;
+	struct bc_msg *cmd_list;
   	brm_priv *brm;
 	struct drvmgr_dev *dev;
 	rtems_device_driver ret;
@@ -1013,6 +1013,9 @@ static rtems_device_driver brm_control(rtems_device_major_number major, rtems_de
 		return RTEMS_INVALID_NAME;
 	}
 
+        data = ioarg->buffer;
+        cmd_list = (struct bc_msg *) ioarg->buffer;
+
 	ioarg->ioctl_return = 0;
 	switch (ioarg->command) {
 



More information about the vc mailing list