From patchwork Wed Apr 24 22:29:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 2486731 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 84FA2DF25A for ; Wed, 24 Apr 2013 22:32:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758607Ab3DXWaj (ORCPT ); Wed, 24 Apr 2013 18:30:39 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:55078 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757045Ab3DXWaV (ORCPT ); Wed, 24 Apr 2013 18:30:21 -0400 Received: by mail-wi0-f177.google.com with SMTP id hj19so2650013wib.16 for ; Wed, 24 Apr 2013 15:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=qXneNPacPaDBVB20qSlhUIrwLNuAzxgyYYaVoVbPmZc=; b=BiC//LXuAUP93Ccdhafdcsm4sXziK2eN0B7JIiQ8Ce4zRhgestIY/jBGN+qY06xlJe 3kNQUER8gwh/N3Ae2piP021ZO8l8YL9H2BeyNtBMXyJUiRZxLuR1ZrTtskx6IX+EaFEq LvZ4v6OEcDMU4aX76b4j6rfVC3yxFQmjmrAffmmKGFjdYYIyGEW2UGhWdpK9QsJ72FAZ BnWz0h+r6KPgAtvBPVQSUlHaZUo37PWZDygPY6kWAniTpO7vgibNCR10CuTstWfx5Irm ATSifH+K84UtRyCN/1q1Srb1plVfZPgU1c7kA5j0ORYfLid+FY1m4+5yWSKttbLffQjf PhPQ== X-Received: by 10.194.11.70 with SMTP id o6mr7909658wjb.29.1366842620040; Wed, 24 Apr 2013 15:30:20 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id t14sm35982534wib.0.2013.04.24.15.30.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Apr 2013 15:30:19 -0700 (PDT) From: "Yann E. MORIN" To: linux-kbuild@vger.kernel.org Cc: Michal Marek , linux-kernel@vger.kernel.org, Benjamin Poirier , "Yann E. MORIN" , stable@vger.kernel.org Subject: [PATCH 1/8] menuconfig: Fix memory leak introduced by jump keys feature Date: Thu, 25 Apr 2013 00:29:48 +0200 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Benjamin Poirier Fixes the memory leak of struct jump_key allocated in get_prompt_str() Signed-off-by: Benjamin Poirier Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: "Yann E. MORIN" Cc: stable@vger.kernel.org --- scripts/kconfig/list.h | 13 +++++++++++++ scripts/kconfig/mconf.c | 3 +++ 2 files changed, 16 insertions(+) diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h index 0ae730b..b87206c 100644 --- a/scripts/kconfig/list.h +++ b/scripts/kconfig/list.h @@ -51,6 +51,19 @@ struct list_head { pos = list_entry(pos->member.next, typeof(*pos), member)) /** + * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + */ +#define list_for_each_entry_safe(pos, n, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member), \ + n = list_entry(pos->member.next, typeof(*pos), member); \ + &pos->member != (head); \ + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + +/** * list_empty - tests whether a list is empty * @head: the list to test. */ diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 566288a..c5418d6 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -389,6 +389,7 @@ again: .targets = targets, .keys = keys, }; + struct jump_key *pos, *tmp; res = get_relations_str(sym_arr, &head); dres = show_textbox_ext(_("Search Results"), (char *) @@ -402,6 +403,8 @@ again: again = true; } str_free(&res); + list_for_each_entry_safe(pos, tmp, &head, entries) + free(pos); } while (again); free(sym_arr); str_free(&title);