From patchwork Tue Dec 24 11:42:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 21292 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VvQQn-0007xv-To; Tue, 24 Dec 2013 12:45:49 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1VvQQl-0004k8-9A; Tue, 24 Dec 2013 12:45:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752056Ab3LXLpo (ORCPT + 1 other); Tue, 24 Dec 2013 06:45:44 -0500 Received: from mail-pb0-f42.google.com ([209.85.160.42]:57882 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974Ab3LXLpf (ORCPT ); Tue, 24 Dec 2013 06:45:35 -0500 Received: by mail-pb0-f42.google.com with SMTP id uo5so6415607pbc.15 for ; Tue, 24 Dec 2013 03:45:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u0qCQGrhuS0qWyHQ32Cc8L54XFInULuxiT/5qmtBQ8I=; b=GNvX3Q1IKvHRBkiGtpgjTC3NU2T1fxU8YQXB/5TegF+lWKVoP5+IE6ZxV88ItPj3pS rk2OKG+rjRyO+t4bvrGU09BQYbi9cTiLUQMhgfWBnK0zaQby9HDCeMDiJi9n8swdWPoj 2ZYJz5B94rNXUVNbarQtELuNsXAZF1uDt14cAKPQwMWfhcNGUE2AcupvKHlZsIV/kZMm iQD7lvTCfxtIitgX7emAMpXkK3zpynDng9eH3bFNtb4GieUB5UMT7TzrF+johgWyiRk+ Ox/HGk1NPSlMIUr08HrVuBb0oeyhbHYfADeyhs7g/P5p8vAdBMX+M5XaLYxXtHw/PogG yKxQ== X-Gm-Message-State: ALoCoQl6PZsRHmnrG1vif4nAhRRInjftGtJGD0MI4s75C9s5rsT15PiVMrMyp4HNqRksHU5D0UPP X-Received: by 10.68.211.39 with SMTP id mz7mr31846141pbc.90.1387885534567; Tue, 24 Dec 2013 03:45:34 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id ug2sm53640678pac.21.2013.12.24.03.45.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Dec 2013 03:45:34 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: a.hajda@samsung.com, s.nawrocki@samsung.com, sachin.kamat@linaro.org Subject: [PATCH 3/3] [media] s5k5baf: Fix potential NULL pointer dereferencing Date: Tue, 24 Dec 2013 17:12:05 +0530 Message-Id: <1387885325-17639-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387885325-17639-1-git-send-email-sachin.kamat@linaro.org> References: <1387885325-17639-1-git-send-email-sachin.kamat@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.12.24.113315 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Dereference 'fw' after the NULL check. Signed-off-by: Sachin Kamat --- drivers/media/i2c/s5k5baf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c index 974b865c2ee1..4b8381111cbd 100644 --- a/drivers/media/i2c/s5k5baf.c +++ b/drivers/media/i2c/s5k5baf.c @@ -548,12 +548,14 @@ static void s5k5baf_synchronize(struct s5k5baf *state, int timeout, u16 addr) static u16 *s5k5baf_fw_get_seq(struct s5k5baf *state, u16 seq_id) { struct s5k5baf_fw *fw = state->fw; - u16 *data = fw->data + 2 * fw->count; + u16 *data; int i; if (fw == NULL) return NULL; + data = fw->data + 2 * fw->count; + for (i = 0; i < fw->count; ++i) { if (fw->seq[i].id == seq_id) return data + fw->seq[i].offset;