evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: ais: jpegdma: Fix for ASAN issues in jpegdma module

Browse source 
Adding Lock mechanism to avoid concurrency issues between reqbufs
and streamoff calls.

Change-Id: Ic915d346d0aa60d71007a359760a6a573734b6e5
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
This commit is contained in:
Suprith Malligere Shankaregowda 2018-03-23 14:13:28 +05:30 • committed by Gerrit - the friendly Code Review server
parent ef00227cce
commit 0a5632c04d
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/platform/msm/ais/jpeg_dma/msm_jpeg_dma_dev.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -754,9 +754,12 @@ static int msm_jpegdma_s_fmt_vid_out(struct file *file,
static int msm_jpegdma_reqbufs(struct file *file,
void *fh, struct v4l2_requestbuffers *req)
{
int ret = 0;
struct jpegdma_ctx *ctx = msm_jpegdma_ctx_from_fh(fh);
return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, req);
mutex_lock(&ctx->lock);
ret = v4l2_m2m_reqbufs(file, ctx->m2m_ctx, req);
mutex_unlock(&ctx->lock);
return ret;
}
/*
@ -833,11 +836,11 @@ static int msm_jpegdma_streamoff(struct file *file,
{
struct jpegdma_ctx *ctx = msm_jpegdma_ctx_from_fh(fh);
int ret;
mutex_lock(&ctx->lock);
ret = v4l2_m2m_streamoff(file, ctx->m2m_ctx, buf_type);
if (ret < 0)
dev_err(ctx->jdma_device->dev, "Stream off fails\n");
mutex_unlock(&ctx->lock);
return ret;
}