media: amphion: fix some issues to improve robust
Ming Qian
maintainerPATCH v2 1/1 media: amphion: fix some issues to improve robust
fix some issues reported by Dan,
1. fix some signedness bug
2. don't use u32 as function return value
3. prevent a divide by zero bug
4. Just return zero on success, don't return a known parameter
5. check the validity of some variables
6. reset buffer state when return buffers
7. make sure the ALIGN won't wrap to zero
Signed-off-by Ming Qian <[email protected]>
Reported-by Dan Carpenter <[email protected]>
--- drivers/media/platform/amphion/vpu_core.c | 2 +- drivers/media/platform/amphion/vpu_helpers.c | 13 ++-- drivers/media/platform/amphion/vpu_helpers.h | 6 +- drivers/media/platform/amphion/vpu_imx8q.c | 2 +- drivers/media/platform/amphion/vpu_imx8q.h | 2 +- drivers/media/platform/amphion/vpu_malone.c | 63 +++++++++++++------- drivers/media/platform/amphion/vpu_msgs.c | 6 +- drivers/media/platform/amphion/vpu_rpc.c | 4 +- drivers/media/platform/amphion/vpu_rpc.h | 9 ++- drivers/media/platform/amphion/vpu_v4l2.c | 8 ++- drivers/media/platform/amphion/vpu_windsor.c | 6 ++ 11 files changed, 78 insertions(+), 43 deletions(-)
drivers/media/platform/amphion/vpu_core.c +1 -1
@@ -472,7 +472,7 @@ struct vpu_inst *vpu_core_find_instance(struct vpu_core *core, u32 index)struct vpu_inst *tmp;mutex_lock (&core->lock); -if (!test_bit (index, &core->instance_mask)) +if (index >= core->supported_instance_count || !test_bit (index, &core->instance_mask)) goto exit;list_for_each_entry (tmp, &core->instances, list) {if (tmp->id == index) {
drivers/media/platform/amphion/vpu_helpers.c +7 -6
@@ -197,7 +197,7 @@ u32 vpu_helper_get_plane_size(u32 fmt, u32 w, u32 h, int plane_no, } } -u32 vpu_helper_copy_from_stream_buffer (struct vpu_buffer *stream_buffer, +int vpu_helper_copy_from_stream_buffer (struct vpu_buffer *stream_buffer,u32 *rptr,u32 size,void *dst) {u32 offset;
@@ -227,10 +227,11 @@ u32 vpu_helper_copy_from_stream_buffer(struct vpu_buffer *stream_buffer, } *rptr =vpu_helper_step_walk (stream_buffer, offset, size); -return size; + +return 0 ; } -u32 vpu_helper_copy_to_stream_buffer (struct vpu_buffer *stream_buffer, +int vpu_helper_copy_to_stream_buffer (struct vpu_buffer *stream_buffer,u32 *wptr,u32 size,void *src) {u32 offset;
@@ -260,10 +261,10 @@ u32 vpu_helper_copy_to_stream_buffer(struct vpu_buffer *stream_buffer, *wptr =vpu_helper_step_walk (stream_buffer, offset, size); -return size; +return 0 ; } -u32 vpu_helper_memset_stream_buffer (struct vpu_buffer *stream_buffer, +int vpu_helper_memset_stream_buffer (struct vpu_buffer *stream_buffer,u32 *wptr,u8 val,u32 size) {u32 offset;
@@ -297,7 +298,7 @@ u32 vpu_helper_memset_stream_buffer(struct vpu_buffer *stream_buffer, *wptr = offset; -return size; +return 0 ; }u32 vpu_helper_get_free_space (struct vpu_inst *inst)
drivers/media/platform/amphion/vpu_helpers.h +3 -3
@@ -19,11 +19,11 @@ u32 vpu_helper_valid_frame_width(struct vpu_inst *inst, u32 width);u32 vpu_helper_valid_frame_height (struct vpu_inst *inst,u32 height);u32 vpu_helper_get_plane_size (u32 fmt,u32 width,u32 height,int plane_no,u32 stride,u32 interlaced,u32 *pbl); -u32 vpu_helper_copy_from_stream_buffer (struct vpu_buffer *stream_buffer, +int vpu_helper_copy_from_stream_buffer (struct vpu_buffer *stream_buffer,u32 *rptr,u32 size,void *dst); -u32 vpu_helper_copy_to_stream_buffer (struct vpu_buffer *stream_buffer, +int vpu_helper_copy_to_stream_buffer (struct vpu_buffer *stream_buffer,u32 *wptr,u32 size,void *src); -u32 vpu_helper_memset_stream_buffer (struct vpu_buffer *stream_buffer, +int vpu_helper_memset_stream_buffer (struct vpu_buffer *stream_buffer,u32 *wptr,u8 val,u32 size);u32 vpu_helper_get_free_space (struct vpu_inst *inst);u32 vpu_helper_get_used_space (struct vpu_inst *inst);
drivers/media/platform/amphion/vpu_imx8q.c +1 -1
@@ -165,7 +165,7 @@ int vpu_imx8q_on_firmware_loaded(struct vpu_core *core)return 0 ; } -u32 vpu_imx8q_check_memory_region (dma_addr_t base,dma_addr_t addr,u32 size) +int vpu_imx8q_check_memory_region (dma_addr_t base,dma_addr_t addr,u32 size) {const struct vpu_rpc_region_t imx8q_regions[] = { {0x00000000 ,0x08000000 ,VPU_CORE_MEMORY_CACHED },
drivers/media/platform/amphion/vpu_imx8q.h +1 -1
@@ -108,7 +108,7 @@ int vpu_imx8q_set_system_cfg_common(struct vpu_rpc_system_config *config, u32 reint vpu_imx8q_boot_core (struct vpu_core *core);int vpu_imx8q_get_power_state (struct vpu_core *core);int vpu_imx8q_on_firmware_loaded (struct vpu_core *core); -u32 vpu_imx8q_check_memory_region (dma_addr_t base,dma_addr_t addr,u32 size); +int vpu_imx8q_check_memory_region (dma_addr_t base,dma_addr_t addr,u32 size);bool vpu_imx8q_check_codec (enum vpu_core_type type);bool vpu_imx8q_check_fmt (enum vpu_core_type type,u32 pixelfmt);
drivers/media/platform/amphion/vpu_malone.c +40 -23
160 lines not on this page · raw message
drivers/media/platform/amphion/vpu_msgs.c +3 -3
@@ -214,7 +214,7 @@ static int vpu_session_handle_msg(struct vpu_inst *inst, struct vpu_rpc_event *mstatic bool vpu_inst_receive_msg (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -u32 bytes =sizeof (struct vpu_rpc_event_header ); +unsigned long bytes =sizeof (struct vpu_rpc_event_header );u32 ret;memset (pkt,0 ,sizeof (*pkt));
@@ -246,7 +246,7 @@ void vpu_inst_run_work(struct work_struct *work)static void vpu_inst_handle_msg (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -u32 bytes; +unsigned long bytes;u32 id = pkt->hdr.id;int ret;
@@ -337,7 +337,7 @@ void vpu_msg_delayed_work(struct work_struct *work) {struct vpu_core *core;struct delayed_work *dwork; -u32 bytes =sizeof (bytes); +unsigned long bytes =sizeof (u32);u32 i;if (!work)
drivers/media/platform/amphion/vpu_rpc.c +3 -1
@@ -20,7 +20,7 @@#include "vpu_windsor.h" #include "vpu_malone.h" -u32 vpu_iface_check_memory_region (struct vpu_core *core,dma_addr_t addr,u32 size) +int vpu_iface_check_memory_region (struct vpu_core *core,dma_addr_t addr,u32 size) {struct vpu_iface_ops *ops =vpu_core_get_iface (core);
@@ -63,6 +63,8 @@ static int vpu_rpc_send_cmd_buf(struct vpu_shared_addr *shared, struct vpu_rpc_eu32 wptr;u32 i; +if (cmd->hdr.num >0xff || cmd->hdr.num >=ARRAY_SIZE (cmd->data)) +return -EINVAL ; desc = shared->cmd_desc; space =vpu_rpc_check_buffer_space (desc, true);if (space < (((cmd->hdr.num +1 ) <<2 ) +16 ))
drivers/media/platform/amphion/vpu_rpc.h +7 -2
@@ -43,7 +43,7 @@ struct vpu_iface_ops {bool (*check_codec)(enum vpu_core_type type);bool (*check_fmt)(enum vpu_core_type type,u32 pixelfmt);u32 (*get_data_size)(void); -u32 (*check_memory_region)(dma_addr_t base,dma_addr_t addr,u32 size); +int (*check_memory_region)(dma_addr_t base,dma_addr_t addr,u32 size);int (*boot_core)(struct vpu_core *core);int (*shutdown_core)(struct vpu_core *core);int (*restore_core)(struct vpu_core *core);
@@ -113,7 +113,7 @@ struct vpu_rpc_region_t {struct vpu_iface_ops *vpu_core_get_iface (struct vpu_core *core);struct vpu_iface_ops *vpu_inst_get_iface (struct vpu_inst *inst); -u32 vpu_iface_check_memory_region (struct vpu_core *core,dma_addr_t addr,u32 size); +int vpu_iface_check_memory_region (struct vpu_core *core,dma_addr_t addr,u32 size);static inline bool vpu_iface_check_codec (struct vpu_core *core) {
@@ -342,6 +342,11 @@ static inline int vpu_iface_config_stream_buffer(struct vpu_inst *inst,if (!ops || !ops->config_stream_buffer || inst->id <0 )return -EINVAL ; +if ((buf->phys %4 ) || (buf->length %4 )) +return -EINVAL ; +if (buf->phys + buf->length > (u64 )UINT_MAX ) +return -EINVAL ; +return ops->config_stream_buffer (inst->core->iface, inst->id, buf); }
drivers/media/platform/amphion/vpu_v4l2.c +6 -2
@@ -403,11 +403,15 @@ void vpu_vb2_buffers_return(struct vpu_inst *inst, unsigned int type, enum vb2_bstruct vb2_v4l2_buffer *buf;if (V4L2_TYPE_IS_OUTPUT (type)) { -while ((buf =v4l2_m2m_src_buf_remove (inst->fh.m2m_ctx))) +while ((buf =v4l2_m2m_src_buf_remove (inst->fh.m2m_ctx))) { +vpu_set_buffer_state (buf,VPU_BUF_STATE_IDLE );v4l2_m2m_buf_done (buf, state); + } }else { -while ((buf =v4l2_m2m_dst_buf_remove (inst->fh.m2m_ctx))) +while ((buf =v4l2_m2m_dst_buf_remove (inst->fh.m2m_ctx))) { +vpu_set_buffer_state (buf,VPU_BUF_STATE_IDLE );v4l2_m2m_buf_done (buf, state); + } } }
drivers/media/platform/amphion/vpu_windsor.c +6 -0
@@ -818,12 +818,18 @@ int vpu_windsor_config_memory_resource(struct vpu_shared_addr *shared,switch (type) {case MEM_RES_ENC : +if (index >=ARRAY_SIZE (pool->enc_frames)) +return -EINVAL ; res = &pool->enc_frames[index];break ;case MEM_RES_REF : +if (index >=ARRAY_SIZE (pool->ref_frames)) +return -EINVAL ; res = &pool->ref_frames[index];break ;case MEM_RES_ACT : +if (index) +return -EINVAL ; res = &pool->act_frame;break ;default :
Signature · 1 line
2.33.0