Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1226544ybn; Tue, 24 Sep 2019 17:04:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqynl5vFtk8xMCE0JaCQ+7VJgzfMsopj7WjcrsCOgNQKGCwSmGIqRfeOBts0lY/eiJRPF0uF X-Received: by 2002:a5d:694c:: with SMTP id r12mr5289467wrw.44.1569369844552; Tue, 24 Sep 2019 17:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569369844; cv=none; d=google.com; s=arc-20160816; b=tDTc1MERtF3/hTjY8g7RBQZuT0k+PW2tqqEjAOoNSm7zPYAIYqHjwNyW6z/6oqJrJz AAWzdULxCQ+JFm6z3vye0TgH4T0LzSa1TeYU/MDt2ew7ISoh/plyXD8lq8Ii+hIBh44L xygew8CS20qcwo0BK7nnSrXMb+i/NCebfdJRsfiS+NDzRVoi8XnqhQNVPrzDufz7GWUR vzLAfl8DaYF7b2j0P+P85VCa/vwhTji1fLKmRVtVwFMFCqkDkB5gIjSI3o7ouu+blCM9 krwvLJcf6HUcEmbVLtQmRJgDCTK+/A5ZeVlEaL9eBS0BKari9sq5efFl5+IBrsd5dZTc +p5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XrmhahMA5TcW0v7zvMu3hJ0MFd0Ot6PsqNh6snUP5qw=; b=qcrd1zKRbQU7pvZfF7ICaMCdShaQD7IA3+xab6x1S83O2FTsXhtv79WvfnwKkG5Gw3 Am905X98Fe2oyn5dK9HIW+mub8xSkwJVp+BR31lLWenyH4hwqiCupUYOjlDl5/uM0kmg h5VbphU3DOdzdaCmjJ6FhBC7GM5jz3uNug4Ov11XCmfLqAJGZDExE/glMSlKc8pWTkRe fuUGzCm86i0jHX76pA6vV8BsSjY5qTurIBkvNkbTWCpp0WE7s1zmRM3B0vuPWDQWyYLv FPv/nsr4VdnGyt08eiaqDmByo5t5f9tY0yB1SSY4vUrSPIYXTC3JWox7BhWHRdH/5Fa7 3aXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AyBahuBq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12si2147140edc.50.2019.09.24.17.03.37; Tue, 24 Sep 2019 17:04:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AyBahuBq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389445AbfIVTiJ (ORCPT + 99 others); Sun, 22 Sep 2019 15:38:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:41306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389370AbfIVSph (ORCPT ); Sun, 22 Sep 2019 14:45:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC3982186A; Sun, 22 Sep 2019 18:45:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177936; bh=NJLxmO+sPDzSi40Zm+6uwJ9bnxqS9Qk6TiNQiFwfxvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AyBahuBq9QU4pVtIf8i1p6k+DwBXOjHOwOCOZqVHcav99qpnqV1ET6RRoP/5NAaf+ E3PRsnKIlm353qPmjiwWo8s6PVITYvn2nwCHSMDrtbpQ3a4fvkMygI3vxrNVQAiah1 SZTfuO4y/HXxz7IFpioVRvHyvS8+16/NQUKz79Z4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: chenzefeng , Tony Luck , Sasha Levin , linux-ia64@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 046/203] ia64:unwind: fix double free for mod->arch.init_unw_table Date: Sun, 22 Sep 2019 14:41:12 -0400 Message-Id: <20190922184350.30563-46-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: chenzefeng [ Upstream commit c5e5c48c16422521d363c33cfb0dcf58f88c119b ] The function free_module in file kernel/module.c as follow: void free_module(struct module *mod) { ...... module_arch_cleanup(mod); ...... module_arch_freeing_init(mod); ...... } Both module_arch_cleanup and module_arch_freeing_init function would free the mod->arch.init_unw_table, which cause double free. Here, set mod->arch.init_unw_table = NULL after remove the unwind table to avoid double free. Signed-off-by: chenzefeng Signed-off-by: Tony Luck Signed-off-by: Sasha Levin --- arch/ia64/kernel/module.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 326448f9df160..1a42ba885188a 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c @@ -914,10 +914,14 @@ module_finalize (const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *mo void module_arch_cleanup (struct module *mod) { - if (mod->arch.init_unw_table) + if (mod->arch.init_unw_table) { unw_remove_unwind_table(mod->arch.init_unw_table); - if (mod->arch.core_unw_table) + mod->arch.init_unw_table = NULL; + } + if (mod->arch.core_unw_table) { unw_remove_unwind_table(mod->arch.core_unw_table); + mod->arch.core_unw_table = NULL; + } } void *dereference_module_function_descriptor(struct module *mod, void *ptr) -- 2.20.1