From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965473AbcHNLcK (ORCPT ); Sun, 14 Aug 2016 07:32:10 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:52395 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964811AbcHNLcI (ORCPT ); Sun, 14 Aug 2016 07:32:08 -0400 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Michal Nazarewicz" , "Felipe Balbi" , "Dan Carpenter" Date: Sat, 13 Aug 2016 18:42:58 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 45/94] usb: f_fs: off by one bug in _ffs_func_bind() In-Reply-To: X-SA-Exim-Connect-IP: 92.40.249.202 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2.82-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter commit 0015f9156092d07b3ec06d37d014328419d5832e upstream. This loop is supposed to set all the .num[] values to -1 but it's off by one so it skips the first element and sets one element past the end of the array. I've cleaned up the loop a little as well. Fixes: ddf8abd25994 ('USB: f_fs: the FunctionFS driver') Acked-by: Michal Nazarewicz Signed-off-by: Dan Carpenter Signed-off-by: Felipe Balbi [bwh: Backported to 3.2: - Adjust filename, context - Add 'i' for iteration but don't bother with 'eps_ptr' as the calculation is simpler here] Signed-off-by: Ben Hutchings --- --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -2165,7 +2165,7 @@ static int ffs_func_bind(struct usb_conf const int high = gadget_is_dualspeed(func->gadget) && func->ffs->hs_descs_count; - int ret; + int ret, i; /* Make it a single chunk, less management later on */ struct { @@ -2194,8 +2194,8 @@ static int ffs_func_bind(struct usb_conf memset(data->eps, 0, sizeof data->eps); memcpy(data->raw_descs, ffs->raw_descs + 16, sizeof data->raw_descs); memset(data->inums, 0xff, sizeof data->inums); - for (ret = ffs->eps_count; ret; --ret) - data->eps[ret].num = -1; + for (i = 0; i < ffs->eps_count; i++) + data->eps[i].num = -1; /* Save pointers */ func->eps = data->eps;