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

msm: camera: Use mutex lock to avoid race condition

Browse source 
Use mutex lock before using queuing ioctls like
queuing, dequeing buffers to avoid race condition.

Change-Id: I59c70f2abe3daddf38761a2f17671d3d49f43989
CRs-fixed: 2038086
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
This commit is contained in:
Terence Ho 2017-06-14 16:26:07 -04:00 • committed by Gerrit - the friendly Code Review server
parent e3a07a2190
commit 3642b7a3b6
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/media/platform/msm/ais/fd/msm_fd_dev.c
View file

@ -745,9 +745,13 @@ static int msm_fd_s_fmt_vid_out(struct file *file,
static int msm_fd_reqbufs(struct file *file, static int msm_fd_reqbufs(struct file *file,
void *fh, struct v4l2_requestbuffers *req) void *fh, struct v4l2_requestbuffers *req)
{ {
int ret;
struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh); struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);
return vb2_reqbufs(&ctx->vb2_q, req); mutex_lock(&ctx->fd_device->recovery_lock);
ret = vb2_reqbufs(&ctx->vb2_q, req);
mutex_unlock(&ctx->fd_device->recovery_lock);
return ret;
} }
/* /*
@ -759,9 +763,14 @@ static int msm_fd_reqbufs(struct file *file,
static int msm_fd_qbuf(struct file *file, void *fh, static int msm_fd_qbuf(struct file *file, void *fh,
struct v4l2_buffer *pb) struct v4l2_buffer *pb)
{ {
int ret;
struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh); struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);
return vb2_qbuf(&ctx->vb2_q, pb); mutex_lock(&ctx->fd_device->recovery_lock);
ret = vb2_qbuf(&ctx->vb2_q, pb);
mutex_unlock(&ctx->fd_device->recovery_lock);
return ret;
} }
/* /*
@ -773,9 +782,13 @@ static int msm_fd_qbuf(struct file *file, void *fh,
static int msm_fd_dqbuf(struct file *file, static int msm_fd_dqbuf(struct file *file,
void *fh, struct v4l2_buffer *pb) void *fh, struct v4l2_buffer *pb)
{ {
int ret;
struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh); struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);
return vb2_dqbuf(&ctx->vb2_q, pb, file->f_flags & O_NONBLOCK); mutex_lock(&ctx->fd_device->recovery_lock);
ret = vb2_dqbuf(&ctx->vb2_q, pb, file->f_flags & O_NONBLOCK);
mutex_unlock(&ctx->fd_device->recovery_lock);
return ret;
} }
/* /*