From patchwork Fri Mar 1 00:43:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 2201591 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id ADCA8DF24C for ; Fri, 1 Mar 2013 12:45:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A501AE6484 for ; Fri, 1 Mar 2013 04:45:50 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 47015E60F3 for ; Thu, 28 Feb 2013 16:44:05 -0800 (PST) Received: by mail-pa0-f54.google.com with SMTP id fa10so1456351pad.13 for ; Thu, 28 Feb 2013 16:44:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=9zGtcDNWqHo9N2ufMLCvRsyN5YvO7LklL1EIyO9IWGM=; b=WoXG6OpW+cjK/yDcAiy9B9zhZRXRssJ5rSLEV5FBSlRPcJ5CCaZK2Ac3NpTFTX2SRq FPlY7sp0PFGfoUEfidn963l1pFCYKDwTq4GMW69t4gIhaelqVA8iE7fKQd2H5ZY3h27P y31C/G0BiduHJdX0OWDXZpyUUC8kCkfUYxEsvI+BHDW5Zuc+bvXZvIkTSoVVfMLmIaq3 DhFv5aS9d2A2SgCagAvWmke2Ux8Lf/PdtMmN9bguIlNV9A9SNIqVWo82k77BSJOSp5pO WJkKCL6Gea43M7pXRVmZbe3y7TesLd+/hAiaYpLtuv9y/aDCgLhnxWm83P/bSbkbKWYM U+kQ== X-Received: by 10.66.176.170 with SMTP id cj10mr16307926pac.32.1362098645212; Thu, 28 Feb 2013 16:44:05 -0800 (PST) Received: from localhost.localdomain (c-24-21-54-107.hsd1.or.comcast.net. [24.21.54.107]) by mx.google.com with ESMTPS id dx17sm10914892pac.17.2013.02.28.16.44.03 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Feb 2013 16:44:04 -0800 (PST) From: John Stultz To: lkml Subject: [PATCH 16/30] staging: sync: Fix error paths Date: Thu, 28 Feb 2013 16:43:12 -0800 Message-Id: <1362098606-26469-17-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362098606-26469-1-git-send-email-john.stultz@linaro.org> References: <1362098606-26469-1-git-send-email-john.stultz@linaro.org> X-Gm-Message-State: ALoCoQl8zmxRRJiCSa4Yrxi3dpEr0KFGHnxrKWdU/pMWtFuUrfZmro9YIM0bgEu9aAzaYFBgDKFt X-Mailman-Approved-At: Fri, 01 Mar 2013 04:21:19 -0800 Cc: Rob Clark , Daniel Vetter , dri-devel@lists.freedesktop.org, John Stultz , Greg KH , Rebecca Schultz Zavin , Android Kernel Team X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org From: Rebecca Schultz Zavin Check the return value of get_unused_fd to make sure a valid file descriptor is returned. Make sure to call put_unused_fd even if an error occurs before the fd can be used. Cc: Maarten Lankhorst Cc: Erik Gilling Cc: Daniel Vetter Cc: Rob Clark Cc: Sumit Semwal Cc: Greg KH Cc: dri-devel@lists.freedesktop.org Cc: Android Kernel Team Signed-off-by: Rebecca Schultz Zavin Signed-off-by: John Stultz --- drivers/staging/android/sync.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 61c27bd..c4a3c1d 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -647,8 +647,13 @@ static long sync_fence_ioctl_merge(struct sync_fence *fence, unsigned long arg) struct sync_fence *fence2, *fence3; struct sync_merge_data data; - if (copy_from_user(&data, (void __user *)arg, sizeof(data))) - return -EFAULT; + if (fd < 0) + return fd; + + if (copy_from_user(&data, (void __user *)arg, sizeof(data))) { + err = -EFAULT; + goto err_put_fd; + } fence2 = sync_fence_fdget(data.fd2); if (fence2 == NULL) {