Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10android-15-beta-1_r0.5android-15-beta-1_r0.3android-gs-raviole-5.10-android15-dpandroid-gs-raviole-5.10-android15-betaandroid-gs-lynx-5.10-android15-dpandroid-gs-lynx-5.10-android15-beta

SBMerger: 571992243
Change-Id: Ib7b36542f865f880e730d33045ee81e4eab558ed
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/bigo.c b/bigo.c
index 9927798..6a35ae3 100644
--- a/bigo.c
+++ b/bigo.c
@@ -394,7 +394,8 @@ static long bigo_unlocked_ioctl(struct file *file, unsigned int cmd,
 
 		if (copy_regs_from_user(core, &desc, user_desc, job)) {
 			pr_err("Failed to copy regs from user\n");
-			return -EFAULT;
+			rc = -EFAULT;
+			break;
 		}
 
 		hbd = (((u32*)job->regs)[3]) & BIGO_HBD_BIT;
@@ -406,7 +407,8 @@ static long bigo_unlocked_ioctl(struct file *file, unsigned int cmd,
 
 		if(enqueue_prioq(core, inst)) {
 			pr_err("Failed enqueue frame\n");
-			return -EFAULT;
+			rc = -EFAULT;
+			break;
 		}
 
 		ret = wait_for_completion_timeout(
@@ -433,7 +435,8 @@ static long bigo_unlocked_ioctl(struct file *file, unsigned int cmd,
 	case BIGO_IOCX_MAP:
 		if (copy_from_user(&mapping, user_desc, sizeof(mapping))) {
 			pr_err("Failed to copy from user\n");
-			return -EFAULT;
+			rc = -EFAULT;
+			break;
 		}
 		rc = bigo_map(core, inst, &mapping);
 		if (rc)
@@ -446,7 +449,8 @@ static long bigo_unlocked_ioctl(struct file *file, unsigned int cmd,
 	case BIGO_IOCX_UNMAP:
 		if (copy_from_user(&mapping, user_desc, sizeof(mapping))) {
 			pr_err("Failed to copy from user\n");
-			return -EFAULT;
+			rc = -EFAULT;
+			break;
 		}
 		rc = bigo_unmap(inst, &mapping);
 		if (rc)
@@ -461,7 +465,8 @@ static long bigo_unlocked_ioctl(struct file *file, unsigned int cmd,
 	case BIGO_IOCX_CONFIG_FRMSIZE:
 		if (copy_from_user(&frmsize, user_desc, sizeof(frmsize))) {
 			pr_err("Failed to copy from user\n");
-			return -EFAULT;
+			rc = -EFAULT;
+			break;
 		}
 		bigo_config_frmsize(inst, &frmsize);
 		break;