]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
intel_punit_ipc: add NULL check for input parameters
authorQipeng Zha <qipeng.zha@intel.com>
Fri, 8 Jan 2016 10:32:27 +0000 (18:32 +0800)
committerDarren Hart <dvhart@linux.intel.com>
Wed, 20 Jan 2016 01:35:49 +0000 (17:35 -0800)
intel_punit_ipc_command() maybe called when in or out
data pointers are NULL.

Signed-off-by: Qipeng Zha <qipeng.zha@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
drivers/platform/x86/intel_punit_ipc.c

index 16685bc96946f0d1e89412ee761979e0ff8ba2a8..bd875409a02dd3fbc13f8b61d372604e62f8abf1 100644 (file)
@@ -187,10 +187,12 @@ int intel_punit_ipc_command(u32 cmd, u32 para1, u32 para2, u32 *in, u32 *out)
 
        reinit_completion(&ipcdev->cmd_complete);
        type = (cmd & IPC_PUNIT_CMD_TYPE_MASK) >> IPC_TYPE_OFFSET;
-       ipc_write_data_low(ipcdev, type, *in);
 
-       if (type == GTDRIVER_IPC || type == ISPDRIVER_IPC)
-               ipc_write_data_high(ipcdev, type, *++in);
+       if (in) {
+               ipc_write_data_low(ipcdev, type, *in);
+               if (type == GTDRIVER_IPC || type == ISPDRIVER_IPC)
+                       ipc_write_data_high(ipcdev, type, *++in);
+       }
 
        val = cmd & ~IPC_PUNIT_CMD_TYPE_MASK;
        val |= CMD_RUN | para2 << CMD_PARA2_SHIFT | para1 << CMD_PARA1_SHIFT;
@@ -199,10 +201,12 @@ int intel_punit_ipc_command(u32 cmd, u32 para1, u32 para2, u32 *in, u32 *out)
        ret = intel_punit_ipc_check_status(ipcdev, type);
        if (ret)
                goto out;
-       *out = ipc_read_data_low(ipcdev, type);
 
-       if (type == GTDRIVER_IPC || type == ISPDRIVER_IPC)
-               *++out = ipc_read_data_high(ipcdev, type);
+       if (out) {
+               *out = ipc_read_data_low(ipcdev, type);
+               if (type == GTDRIVER_IPC || type == ISPDRIVER_IPC)
+                       *++out = ipc_read_data_high(ipcdev, type);
+       }
 
 out:
        mutex_unlock(&ipcdev->lock);