summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-06-18 18:40:06 -0700
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2023-06-18 18:40:06 -0700
commit782f6f496fc5fe4e930b2d8400186f0287f1327c (patch)
treefc6f0965ca99c1e8a9daf1d2e14fe30ff44c1b6a
parent44abec46467d65abff01abb23193cf00c2dd9e57 (diff)
parentc039521f13476b71f5ead4d625d5fff706ac505f (diff)
downloadgoodix_touch-782f6f496fc5fe4e930b2d8400186f0287f1327c.tar.gz
Merge android14-gs-pixel-5.15-udc-d1 into android14-gs-pixel-5.15-udc-qpr1
SBMerger: 526756187 Change-Id: I35bd4fb152b8b293a44a2312abf5331f04533ba1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--goodix_ts_proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/goodix_ts_proc.c b/goodix_ts_proc.c
index 86657b4..a4ec32d 100644
--- a/goodix_ts_proc.c
+++ b/goodix_ts_proc.c
@@ -3455,7 +3455,7 @@ static ssize_t driver_test_write(struct file *file, const char __user *buf,
int cmd_val2;
u8 id;
- if (count > SHORT_SIZE) {
+ if (count >= SHORT_SIZE) { /* [GOOG] */
ts_err("invalid cmd size[%ld]", count);
return count;
}
@@ -3465,7 +3465,7 @@ static ssize_t driver_test_write(struct file *file, const char __user *buf,
ts_err("copy from user failed");
return count;
}
- p[strlen(p) - 1] = 0;
+ //p[strlen(p) - 1] = 0; /* [GOOG] */
vfree(rbuf);
rbuf = NULL;