From nobody Wed Jul 1 17:38:20 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 908C5C4332F for ; Fri, 17 Dec 2021 06:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233237AbhLQGcz (ORCPT ); Fri, 17 Dec 2021 01:32:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232073AbhLQGcy (ORCPT ); Fri, 17 Dec 2021 01:32:54 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5DD9C06173E; Thu, 16 Dec 2021 22:32:53 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id z29so3954206edl.7; Thu, 16 Dec 2021 22:32:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AsAjCk9qQhY+pBaGcqz3KvnxpttrERJajnH3RPfyHpM=; b=OGrRb2gStGK/8I6F49ek+EI08w23eVGZIVGEkDIc88k5jSnWDFkpLKjwhQG6/sZhuk wBVkfxgAplb15wtDWFCcvHLZJOFYIC3oLZw6tgANwOgcxggEPOdOtT2WJ7/lj2PW9V0a fWS3gDJzi8rE8XCtvUWQGzj71fS1ZHP6vNBZ8nFNhvDpNqMSeBMAGQmimpz4MQQH9abI AhnpalwQ+p0qlqzmaosR/Or2U30qRG1MW2ZIQmGbjq1qSpwiTRG5WcRCIWE3ETvujsYO onDTZ6Ze7TYxBtACwxw3C61awM6EmmFZoyPBaoX6jMQdKMpNr+iJJs7JKpTcZlHrghU7 ewwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AsAjCk9qQhY+pBaGcqz3KvnxpttrERJajnH3RPfyHpM=; b=elY3P+QXY8l7SkxeoO2LPWMIn3ui3J+gxoYeCbnVYeih78x379C/GmXXI5S4xX/3qa MULPoLl+oit/hqcjtIlMMABac7KWSCIJRTMsX3HCKbglllkuH8+lqQJdrPNcLRLnxECD XtwgYLEsZaqpPbdYfKUAu+JQB6Gvy7J6v1y95OTdz2B5anowGbDQmJBZgzqqMfrz5nVv 17F5gOfOy17uzH5d4HoLClP0JVJLBUuT5OfxIWCLp8GFKcKueRW9FCAX5vYFrKBvP0sk F3UquSzi1tp79j6mqWd1TimzgwZoABcxD0ShFNk881xV1Qr7Zi8+4v5OoJ/dEm5CGxzd Kn5Q== X-Gm-Message-State: AOAM531g4JjS6x1yPvFkNhh/Cw3PH05VhDBW9m21jvceLzbpVLpAByi/ zglKzajluoildEdFHX4Z35o= X-Google-Smtp-Source: ABdhPJw7fgsg/IktzkoDmmBR2UV8LnmiKRCN1WduIQHlg0zi3BS9phz3xj+ApCyZ/L/M/EegqIpC+Q== X-Received: by 2002:a17:907:1117:: with SMTP id qu23mr1401185ejb.404.1639722772450; Thu, 16 Dec 2021 22:32:52 -0800 (PST) Received: from zenorus.myxoz.lan (81-224-108-56-no2390.tbcn.telia.com. [81.224.108.56]) by smtp.gmail.com with ESMTPSA id e20sm2490148ejl.189.2021.12.16.22.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 22:32:52 -0800 (PST) From: Miko Larsson To: minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org, axboe@kernel.dk, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Miko Larsson , hch@infradead.org Subject: [PATCH v2 1/2] zram: zram_drv: add SPDX license identifiers Date: Fri, 17 Dec 2021 07:32:23 +0100 Message-Id: <20211217063224.3474-2-mikoxyzzz@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211217063224.3474-1-mikoxyzzz@gmail.com> References: <20211217063224.3474-1-mikoxyzzz@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" zram_drv lacks an SPDX license identifier in both its source and in its header, so we should add license identifiers based on the copyright info provided by the initial comment block. Signed-off-by: Miko Larsson Reviewed-by: Christoph Hellwig --- drivers/block/zram/zram_drv.c | 9 ++------- drivers/block/zram/zram_drv.h | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 25071126995b..4de6fe13edaf 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1,15 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + /* * Compressed RAM block device * * Copyright (C) 2008, 2009, 2010 Nitin Gupta * 2012, 2013 Minchan Kim - * - * This code is released using a dual license strategy: BSD/GPL - * You can choose the licence that better fits your requirements. - * - * Released under the terms of 3-clause BSD License - * Released under the terms of GNU General Public License Version 2.0 - * */ =20 #define KMSG_COMPONENT "zram" diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 80c3b43b4828..29e75e094a9d 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -1,15 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ + /* * Compressed RAM block device * * Copyright (C) 2008, 2009, 2010 Nitin Gupta * 2012, 2013 Minchan Kim - * - * This code is released using a dual license strategy: BSD/GPL - * You can choose the licence that better fits your requirements. - * - * Released under the terms of 3-clause BSD License - * Released under the terms of GNU General Public License Version 2.0 - * */ =20 #ifndef _ZRAM_DRV_H_ --=20 2.34.1 From nobody Wed Jul 1 17:38:20 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4995BC433FE for ; Fri, 17 Dec 2021 06:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233263AbhLQGc5 (ORCPT ); Fri, 17 Dec 2021 01:32:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232191AbhLQGcy (ORCPT ); Fri, 17 Dec 2021 01:32:54 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B3DEC06173E; Thu, 16 Dec 2021 22:32:54 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id g14so3956786edb.8; Thu, 16 Dec 2021 22:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jVz5gmWkvfHnwl1AICB+LrD0LvfkSYpF7pSTjzPszEs=; b=Z/NKcsvrzrquLzVkgn3SArWeTGGKsArSdqDxuzHRyxgYJdTUMmZFGqNx218o4KZ3bi Ji9rMNoA0YP/dXmNbAgN3HetOR14Jbs+vqKfeqU3vrqfhOx/nw3kLxusOR2ZsTUs5j9G 5ZHf/W6RXEyoIDe5ljmek6lYSUPZ07YMnDh/nWuTXXU3PhfI5lB0Sb4G71pt4S5I1LIV RfSHP/p9sRZVfOejmRl9lmsb7cwBky5ZGvH1d8BJAECVAV1v2IwuM417movY/kn71kwT ZiWFLvQ4jOROFx0f4l1j3/dzfDDS9PB1NRa31vuxbPabUeqlobZ0Os+oMSlulozH7lIu pwRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jVz5gmWkvfHnwl1AICB+LrD0LvfkSYpF7pSTjzPszEs=; b=I5rp13Lpec+9+aHGuU8Cov6CRPzgS/mSEXfIY9m/ddseGvi5omxqakBme+RNSWL8qL UzIrSV6saeNcI/UCXzqGaIta0QD5BJXFxuABVQDcMm/LTGW1zNpDlCPpC1Q2OYRZmO+c D6Q+iVAi6eUgQRTB+oM004hgOcn/fWQcR2RhE+wMDSYWwY9zHNai2O3WwRorgRAL9ghi ouuu/B9gGlYoF9eAz/vcV2tehA7MS7EY3xhWRhyRiNhMglT6e/NAo0OtBUGMKJ1eA2tH 3B65M1KouWgo/1dqjfrv6bb756jtyfePog53wkXAPSVXyGHOvytpzsnLUS8iIZw9SbNd YYXA== X-Gm-Message-State: AOAM531jdXxf9r+4hIEBsKEI55/wxwT5/TxzIj4xVbh/hxNCr913dAkq uX1cbPqjHPuaFaQrAFqJaCA= X-Google-Smtp-Source: ABdhPJzel5vzdE3ikJ2oPZCrG4tkSHvvw24nnRQFJNtnW88H0qM7WrEzXjsy8HG1Ycdrc7rQBhxJPA== X-Received: by 2002:aa7:d495:: with SMTP id b21mr1486049edr.363.1639722773000; Thu, 16 Dec 2021 22:32:53 -0800 (PST) Received: from zenorus.myxoz.lan (81-224-108-56-no2390.tbcn.telia.com. [81.224.108.56]) by smtp.gmail.com with ESMTPSA id e20sm2490148ejl.189.2021.12.16.22.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 22:32:52 -0800 (PST) From: Miko Larsson To: minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org, axboe@kernel.dk, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Miko Larsson , hch@infradead.org Subject: [PATCH v2 2/2] zram: zram_drv: replace 'strlcpy()' Date: Fri, 17 Dec 2021 07:32:24 +0100 Message-Id: <20211217063224.3474-3-mikoxyzzz@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211217063224.3474-1-mikoxyzzz@gmail.com> References: <20211217063224.3474-1-mikoxyzzz@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 'strlcpy()' shouldn't be used, and should be replaced with safer alternatives. Cristoph Hellwig suggested [1] that 'kmemdup_nul()' should be used in two cases instead of 'strscpy()', and that a regular 'strcpy()' should be used in the third case. [2][3] [1] https://lore.kernel.org/all/YbsRlDYT2BfgrXRX@infradead.org/ [2] https://lore.kernel.org/all/Ybt8wY3U2ETjQijH@infradead.org/ [3] https://lore.kernel.org/all/Ybt8554NZpscKx2K@infradead.org/ Signed-off-by: Miko Larsson Reviewed-by: Christoph Hellwig --- drivers/block/zram/zram_drv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 4de6fe13edaf..c7c751e6ca2e 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -482,7 +482,7 @@ static ssize_t backing_dev_store(struct device *dev, int err; struct zram *zram =3D dev_to_zram(dev); =20 - file_name =3D kmalloc(PATH_MAX, GFP_KERNEL); + file_name =3D kmemdup_nul(buf, PATH_MAX, GFP_KERNEL); if (!file_name) return -ENOMEM; =20 @@ -493,7 +493,6 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } =20 - strlcpy(file_name, buf, PATH_MAX); /* ignore trailing newline */ sz =3D strlen(file_name); if (sz > 0 && file_name[sz - 1] =3D=3D '\n') @@ -1024,10 +1023,10 @@ static ssize_t comp_algorithm_store(struct device *= dev, struct device_attribute *attr, const char *buf, size_t len) { struct zram *zram =3D dev_to_zram(dev); - char compressor[ARRAY_SIZE(zram->compressor)]; + char *compressor; size_t sz; =20 - strlcpy(compressor, buf, sizeof(compressor)); + compressor =3D kmemdup_nul(buf, sizeof(zram->compressor), GFP_KERNEL); /* ignore trailing newline */ sz =3D strlen(compressor); if (sz > 0 && compressor[sz - 1] =3D=3D '\n') @@ -1981,7 +1980,7 @@ static int zram_add(void) if (ret) goto out_cleanup_disk; =20 - strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor)); + strcpy(zram->compressor, default_compressor); =20 zram_debugfs_register(zram); pr_info("Added device: %s\n", zram->disk->disk_name); --=20 2.34.1