From patchwork Thu Mar 21 16:36:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13599169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 389BBC54E58 for ; Thu, 21 Mar 2024 16:37:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23DD96B00A2; Thu, 21 Mar 2024 12:37:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1794F6B00A3; Thu, 21 Mar 2024 12:37:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EBF006B00A4; Thu, 21 Mar 2024 12:37:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D0F086B00A2 for ; Thu, 21 Mar 2024 12:37:38 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 914B9120BA1 for ; Thu, 21 Mar 2024 16:37:38 +0000 (UTC) X-FDA: 81921602196.08.C2943E3 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf15.hostedemail.com (Postfix) with ESMTP id DAF73A000D for ; Thu, 21 Mar 2024 16:37:36 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SdYyRSmY; spf=pass (imf15.hostedemail.com: domain of 3T2L8ZQYKCDwqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3T2L8ZQYKCDwqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711039056; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LQ90PfNulEINqNY+MaQbbDhVRZQhbHdS/nw/zX5Mh3o=; b=VEvl46TTwgoDyvTzoT9cPuJo0rbooebw9ToGRduz14g5akRbYPlk80yORu3Cjo32T4vUyg nSZ+HCJ1ZgkQbUfz9HFLaE3LEBkSzLIUBH4AaxwJZUHegKs7vplWpuHmBZmDu6D1u9INpv b/XMs87V/PAA3v5IDlfCPhHepAhFUuk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711039056; a=rsa-sha256; cv=none; b=5oYMQ/JgPxeLJ6TQea19dh81RclqR/LFfjNRiDBKTOnayuiAPkfH0Kevb3wRP3/Y2pDWae o7fSGfCp2Ngr0phrbnrwER2qbb84axs7xFgdGrK1yLfeEMdZYvE2oCMGEeYiNRdF3Pwfau tD4aCz/oK6vxzuykEsTqp0btKHYKWsE= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SdYyRSmY; spf=pass (imf15.hostedemail.com: domain of 3T2L8ZQYKCDwqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3T2L8ZQYKCDwqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6ceade361so2069797276.0 for ; Thu, 21 Mar 2024 09:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711039056; x=1711643856; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LQ90PfNulEINqNY+MaQbbDhVRZQhbHdS/nw/zX5Mh3o=; b=SdYyRSmYOyZidIv/072r0L2PukE5CFm774UQuCUptF64PA22hZ5wtaeWOOphWVMj0P 8DsEpuOtN3l/OizjllEYO4nIF7WPN3FgcqywlPbzvxFoTZGblTbd+PpttqeLpBpULBDK VT03KHh8Zevhbc0kIIEyDHiTOtb6auyP5RHa3twK1QmczsjkSHPhCzyHYjsqnJeUOTq6 A/kzcSJgQ+to6V7DRAuxAaehQ8zzSayE+rcQTVZfVGMtM7xrxAOANvaadVFD/zB0xpPY OMsOtoXErMFJqrX5zGmjmyfh+ZVhIBpDiOgl/C8u8XJq/QZHbb5UAqnfwE3/m5t8deSk ySoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039056; x=1711643856; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LQ90PfNulEINqNY+MaQbbDhVRZQhbHdS/nw/zX5Mh3o=; b=mn47JodZgJspOvrSPzxc1dbdCS3y3KzOh/ncmXJqYedvNUSkE8C/BaZELnsQEJPeEK Fdm5w6OHBF0F0Jk38EC8bOwAipqBvxT0Hv4im6vJucLI17u92/PK47VyaZd4Fa+YR4/6 7YNfILXbxbNoGz8ZwjbkXBwCaRekQ8ngG4C4DnprGJ/Tm325bq+tpREhY2Q7MmO4OGi0 jJZZirXgnR0Fhh2OxVkKZPUJ5YiMzgw2NlGAgbLBHQSmtPJSM1qHxhwQeSU3yejpbsB8 6vhgJAMp0QgTag8o+EWlQMJkz69I1RDay8y/yF+STIu4GBX1kChkidcpCMUXknfBnQTX aD1g== X-Forwarded-Encrypted: i=1; AJvYcCV/49MN5RGWl4sd5Ydvh4zEDThh0ZmlxkigqBUFtMyDA6+HOjK0+34FKVRjlhTPcYNgj7TJOWxANB1PMFvzK3uIlC4= X-Gm-Message-State: AOJu0Yy5aiYOublZPGJqSBrsAHW0uIv5NgkWCsSh3RcnYZGXhsG3kVhO e3k0xyiGRU36eAl9wcKE/zRyFjupUL3Ua0JFvRGrA06LCfyFNAA0o6rSiLcp5Ifna9SWUm27V1g i+Q== X-Google-Smtp-Source: AGHT+IGn9vwdodSrX//TEYzDB0YX9rTZ3uTQLDwcOKBoMjo1PHAt30ZDw1z5T1FWhqViEm1/BwfsKtlP0DE= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:a489:6433:be5d:e639]) (user=surenb job=sendgmr) by 2002:a05:6902:1144:b0:dcb:abcc:62be with SMTP id p4-20020a056902114400b00dcbabcc62bemr5818428ybu.6.1711039055775; Thu, 21 Mar 2024 09:37:35 -0700 (PDT) Date: Thu, 21 Mar 2024 09:36:34 -0700 In-Reply-To: <20240321163705.3067592-1-surenb@google.com> Mime-Version: 1.0 References: <20240321163705.3067592-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240321163705.3067592-13-surenb@google.com> Subject: [PATCH v6 12/37] lib: prevent module unloading if memory is not freed From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, jhubbard@nvidia.com, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, songmuchun@bytedance.com, jbaron@akamai.com, aliceryhl@google.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org X-Stat-Signature: bo148sewbh9zop7w9cxe8899bm6jdgzg X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: DAF73A000D X-Rspam-User: X-HE-Tag: 1711039056-814182 X-HE-Meta: U2FsdGVkX1/ijo02wDpxdtifv2xwfYjVeWD6jhWTevYcfqealkvgFawp0xHOB1GCbqHH9d3bTyWjwfz2+kvnbvTxJZPyvjvQR1Jz2TOzKG3+EahR1vqejhEP+l7+eQfNWzfpdW4AP9BWaxFCQ5h1hZIgmY9prtsPaFIq5hxp3UP1S/Q41Se9UjLvXmHYHye9OmX7owvl8JM3TSLbuVrfI+eBmGNzTj1YSs1OZv1ir0sNw1yVB6gK4ht4q7z5wXT+PywwH2zIts5Pa3MRWyGfgblkqAnG87WhJ1mCNYMZLG7OiTP6FWEIENUzLWXph7GJd29rK8IE9oLjV0SPaVY94i9znfH1KTjg5GWspcCiHavBFdw4LsRfj08Y8+WT29qaJEjCBnXOPUrQGLho1BxEk29eGTukbASEftpKHLA5Pk+cjR7RvppATA5LPXZZSgSVL0082n/+rhN9a8mq2Akb3YxU8Q96C8CDOg527gCbUD4Ve3pAIRtoTzqYUpwzzHzy/xF2xQqFYi7/+KlOzK6EopUGdkcP6033mc8t32k1GMT02eXrZUffd6v5dbHd7aLLItDrR/J0UYGL9P6QYNw36yFDPa3t2RZ8cksr+05RPYzTrxBV9xrKZqdn+QfzwEhJZVRrxPPcCO6kXscgazDBqFMhC4e5S9DQ3lidQw0ySoRxLWYZfHbyGhtS+8UsqfBSIFhD9To3PiNRxuxeS6ryiZeKmzYJXZ/zQvCKuhqU2Fqb68vKJ/KF9UKDlKv7/Y60eMw49n3ihU44ny5cUOKVZSZyR6U0fNIglQ8omeTM1j6LslR1iFHI2AaB++GBgJ7SeGTrUi191D94TuK5fMdEstvrs4iBP5U/LeenxxsECUrapnO7gVsVZBJDKfG575aq2ceJWHFVJ6eDZ74NgL3rNYCuaQb0YFLcuYpcdapqrS6uGc9JqklmRiOVkipHASuMB5/tAe8wKOhJd2PD80T kl5MopcU nqNe3ppF8UGGsJnIVlzbJPL1R51Rf2SDUP2cvywFKgLSmdyMKz5mYkgPPs6tR0/J69+dmhn0Z1oSMzFyvH7Kd6J+0qsUwQGPTaaPFd8jWa/hrVtAZebqJ0b8XDfgY6JfJfA/U3tdgecziWcbiz8aJF9uDxc9QmVgN0KLjYHShDrRewiRXtUPDy4uT3NogP+zMgLGrZdtVBAcUIUhZOHLBm1Rwc9VXT1q1mvC1RpEboPPX/hrd+QSeHIjv8cQTInCTWrczg7DFtTIjxdU20HzP/8JoCWzaOilbfft9uKgpUC2dLjDsSpgckz6GvgtNU0kzCGk/AGMctpzMt2SCTlMzhETjru71+m0Q9k3MlF451VWvREEtqwdLUopfyRF4xn8e1LnZtXrGIZQEqxbd05pdX3/PwHNKJMKHMmdY X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Skip freeing module's data section if there are non-zero allocation tags because otherwise, once these allocations are freed, the access to their code tag would cause UAF. Signed-off-by: Suren Baghdasaryan --- include/linux/codetag.h | 6 +++--- kernel/module/main.c | 27 +++++++++++++++++++-------- lib/codetag.c | 11 ++++++++--- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/include/linux/codetag.h b/include/linux/codetag.h index c44f5b83f24d..bfd0ba5c4185 100644 --- a/include/linux/codetag.h +++ b/include/linux/codetag.h @@ -35,7 +35,7 @@ struct codetag_type_desc { size_t tag_size; void (*module_load)(struct codetag_type *cttype, struct codetag_module *cmod); - void (*module_unload)(struct codetag_type *cttype, + bool (*module_unload)(struct codetag_type *cttype, struct codetag_module *cmod); }; @@ -71,10 +71,10 @@ codetag_register_type(const struct codetag_type_desc *desc); #if defined(CONFIG_CODE_TAGGING) && defined(CONFIG_MODULES) void codetag_load_module(struct module *mod); -void codetag_unload_module(struct module *mod); +bool codetag_unload_module(struct module *mod); #else static inline void codetag_load_module(struct module *mod) {} -static inline void codetag_unload_module(struct module *mod) {} +static inline bool codetag_unload_module(struct module *mod) { return true; } #endif #endif /* _LINUX_CODETAG_H */ diff --git a/kernel/module/main.c b/kernel/module/main.c index ffa6b3e9cb43..2d25eebc549d 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1211,15 +1211,19 @@ static void *module_memory_alloc(unsigned int size, enum mod_mem_type type) return module_alloc(size); } -static void module_memory_free(void *ptr, enum mod_mem_type type) +static void module_memory_free(void *ptr, enum mod_mem_type type, + bool unload_codetags) { + if (!unload_codetags && mod_mem_type_is_core_data(type)) + return; + if (mod_mem_use_vmalloc(type)) vfree(ptr); else module_memfree(ptr); } -static void free_mod_mem(struct module *mod) +static void free_mod_mem(struct module *mod, bool unload_codetags) { for_each_mod_mem_type(type) { struct module_memory *mod_mem = &mod->mem[type]; @@ -1230,20 +1234,27 @@ static void free_mod_mem(struct module *mod) /* Free lock-classes; relies on the preceding sync_rcu(). */ lockdep_free_key_range(mod_mem->base, mod_mem->size); if (mod_mem->size) - module_memory_free(mod_mem->base, type); + module_memory_free(mod_mem->base, type, + unload_codetags); } /* MOD_DATA hosts mod, so free it at last */ lockdep_free_key_range(mod->mem[MOD_DATA].base, mod->mem[MOD_DATA].size); - module_memory_free(mod->mem[MOD_DATA].base, MOD_DATA); + module_memory_free(mod->mem[MOD_DATA].base, MOD_DATA, unload_codetags); } /* Free a module, remove from lists, etc. */ static void free_module(struct module *mod) { + bool unload_codetags; + trace_module_free(mod); - codetag_unload_module(mod); + unload_codetags = codetag_unload_module(mod); + if (!unload_codetags) + pr_warn("%s: memory allocation(s) from the module still alive, cannot unload cleanly\n", + mod->name); + mod_sysfs_teardown(mod); /* @@ -1285,7 +1296,7 @@ static void free_module(struct module *mod) kfree(mod->args); percpu_modfree(mod); - free_mod_mem(mod); + free_mod_mem(mod, unload_codetags); } void *__symbol_get(const char *symbol) @@ -2298,7 +2309,7 @@ static int move_module(struct module *mod, struct load_info *info) return 0; out_enomem: for (t--; t >= 0; t--) - module_memory_free(mod->mem[t].base, t); + module_memory_free(mod->mem[t].base, t, true); return ret; } @@ -2428,7 +2439,7 @@ static void module_deallocate(struct module *mod, struct load_info *info) percpu_modfree(mod); module_arch_freeing_init(mod); - free_mod_mem(mod); + free_mod_mem(mod, true); } int __weak module_finalize(const Elf_Ehdr *hdr, diff --git a/lib/codetag.c b/lib/codetag.c index 54d2828eba25..408062f722ce 100644 --- a/lib/codetag.c +++ b/lib/codetag.c @@ -5,6 +5,7 @@ #include #include #include +#include struct codetag_type { struct list_head link; @@ -206,12 +207,13 @@ void codetag_load_module(struct module *mod) mutex_unlock(&codetag_lock); } -void codetag_unload_module(struct module *mod) +bool codetag_unload_module(struct module *mod) { struct codetag_type *cttype; + bool unload_ok = true; if (!mod) - return; + return true; mutex_lock(&codetag_lock); list_for_each_entry(cttype, &codetag_types, link) { @@ -228,7 +230,8 @@ void codetag_unload_module(struct module *mod) } if (found) { if (cttype->desc.module_unload) - cttype->desc.module_unload(cttype, cmod); + if (!cttype->desc.module_unload(cttype, cmod)) + unload_ok = false; cttype->count -= range_size(cttype, &cmod->range); idr_remove(&cttype->mod_idr, mod_id); @@ -237,6 +240,8 @@ void codetag_unload_module(struct module *mod) up_write(&cttype->mod_lock); } mutex_unlock(&codetag_lock); + + return unload_ok; } #else /* CONFIG_MODULES */