From nobody Sun Dec 14 12:17:04 2025 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB67B14F136 for ; Fri, 28 Jun 2024 11:37:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574632; cv=none; b=W5dzGMYbjH9eAVolwbHlJH5uyweI5uRpQg8jgmdPlDLBKa2djF7VM490YfdNGyw5RpNGexgHdXvdhLQykd7AzpkvgITPReyvjfoP7wyOrA5FeJSEKPxR0xhf9rOM5eMQvRdpMRO8ZiGp5bBZ5/+WE7BWCmyVwMWIIYH0cJighys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574632; c=relaxed/simple; bh=uvNcnB9Ff5fU7B8IHkw9VTflTK0qbmhPT0ocf1uno4w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Mq55I8poGLurEWAb6ICAm2uchOaW0WchncRx5pNBazRRqHJWHHtywM9s9rdFVFMZV/o7jtvm2rEB+uOjU2e4G7pc1FkQU/nKo0BzHg5D0MPm3S9lrc/BNUSHt7dGqFoRzN4K5tZdonsXGl1bWb0DptdQGlJLl9afZyG+O0MdatA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=uGXZQM/G; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="uGXZQM/G" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-363bd55bcc2so296281f8f.2 for ; Fri, 28 Jun 2024 04:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719574629; x=1720179429; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fWlN3/sFgEOPWB0LU/uquV7p1t4WmyyxNaTnRP7KUZk=; b=uGXZQM/GNMpB0QNCXupzlcoEpXeBFV+KjoB/K1BQH1VZf1dy7v0mBDfXHOYFQZ3N5+ MIt5NK0jHlVS5etJm9bKHacOHSj1U7mM0WZ02BrCh11MGjMU/5S2SO+JdLrXDYMQuKeG hTZxpQAxD6cJttAWZv7Z9MHjZQjngJN4VNhJ8me/nTAYG5bb5kScmxLFXpmb35rbQdrn KLXsKjyIYsf/69qGCi/O5ADgydI0sbcNQjwroYlYPtMdcBhe6EDi4D5tJMpUJPq11H0f vKu6a607ivC2hkv7WkcnJxqQO8fCVun7Dvh5ROwWHeMTgrvqRXiFUO8VHkfxk7+4sWsI weMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719574629; x=1720179429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fWlN3/sFgEOPWB0LU/uquV7p1t4WmyyxNaTnRP7KUZk=; b=mXdgTd02rszf76V4RPVfs4ZtdUk2YK/tZALfegDFEq11DHzOmSqj5LvJ/tfYOCo0eR 2GOPfInBoCNYphxQop+ierYPpHa7psF/Mpuxfa06zjxnb1RRXhMXDeRThzbBKJaODtac N018eT+FI9YNMrhZHC/uWJ06qmirNRbrVJUXXKEvX6nJpr9YKADdTMA1YgVxgi2l6XCF 9g7D0BnPTXdqhZVBealx6N9wN13epkDZovgOnr+UAUjYY+ij7GS/43FR6aowUWwf1GTg DmD95acuQAWf5rnScrj602BgPZDq5hsTfAcX3eR/Nh80CKhAPTsPsnocfZZjfq/r1Hm5 4V3Q== X-Gm-Message-State: AOJu0YyWvQ+zLVjG+Aa5nolLbFNBtAQh0vmLmyFJXeoJmdxBqwTXSWEp NKC/tXnrAVoySVb+lQ/XCsgkav82uRoHbgIQkvSTiy3Qu0scBmvtZTPBQ80hcAA= X-Google-Smtp-Source: AGHT+IGbATUTf1CtcHvGJ7zBXcjjbG4tWLMniVEGLtMqHk8/pkxS70uyMYSeCOTwFKQbfklLYPgaDw== X-Received: by 2002:a5d:5f90:0:b0:35f:fb4:fc7d with SMTP id ffacd0b85a97d-366fb8dd6e1mr11284914f8f.31.1719574629347; Fri, 28 Jun 2024 04:37:09 -0700 (PDT) Received: from srini-hackbase.lan ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0fba5asm2048937f8f.71.2024.06.28.04.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 04:37:08 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Joy Chakraborty , stable@vger.kernel.org, Dan Carpenter , Srinivas Kandagatla Subject: [PATCH 1/4] nvmem: rmem: Fix return value of rmem_read() Date: Fri, 28 Jun 2024 12:37:01 +0100 Message-Id: <20240628113704.13742-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> References: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1327; i=srinivas.kandagatla@linaro.org; h=from:subject; bh=MOaOKfQhsx5kjf33gADJlKQaVbEXqSwm5ga7NXsrcWs=; b=owEBbQGS/pANAwAKAXqh/VnHNFU3AcsmYgBmfqBTzBgjUHYeEwlbWQDFMaAtBSjcDX/w00E9j 12gnIvUht6JATMEAAEKAB0WIQQi509axvzi9vce3Y16of1ZxzRVNwUCZn6gUwAKCRB6of1ZxzRV N/gYB/46iK1hmFmIdZgewv89dONRCWZR4eRMehgOKAJlPj57exgk/E4yc9cvrTG6jDCJkIOHuwz hfEOrDUORB9Nmmpnwz4/HIp39cRobD+XhsBB3c0uhNyySz3tsxeQgGNuWsideaHK8ZrqDR5Yqcx +9JrenzXH5okKcaR3WPCi5o7b+aZ34qC9st4r6goEcts6k6d/U5g/RMMdRvHKLPTzDNeqIsXshG 00ryA7qvviVS+aUj/0LmOf0VxbATBzXx6nWFTsbABKaLH3X9W+gns0BXGVxXYyJeBYes2NvlIX5 Y3zQ2sylHnztZ25Ooy1LMunh0DL9BQ7+IrdI16GgrQCcCZQ1 X-Developer-Key: i=srinivas.kandagatla@linaro.org; a=openpgp; fpr=ED6472765AB36EC43B3EF97AD77E3FC0562560D6 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joy Chakraborty reg_read() callback registered with nvmem core expects 0 on success and a negative value on error but rmem_read() returns the number of bytes read which is treated as an error at the nvmem core. This does not break when rmem is accessed using sysfs via bin_attr_nvmem_read()/write() but causes an error when accessed from places like nvmem_access_with_keepouts(), etc. Change to return 0 on success and error in case memory_read_from_buffer() returns an error or -EIO if bytes read do not match what was requested. Fixes: 5a3fa75a4d9c ("nvmem: Add driver to expose reserved memory as nvmem") Cc: stable@vger.kernel.org Signed-off-by: Joy Chakraborty Reviewed-by: Dan Carpenter Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/rmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c index 752d0bf4445e..7f907c5a445e 100644 --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -46,7 +46,10 @@ static int rmem_read(void *context, unsigned int offset, =20 memunmap(addr); =20 - return count; + if (count < 0) + return count; + + return count =3D=3D bytes ? 0 : -EIO; } =20 static int rmem_probe(struct platform_device *pdev) --=20 2.25.1 From nobody Sun Dec 14 12:17:04 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 244FF156984 for ; Fri, 28 Jun 2024 11:37:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574633; cv=none; b=M+MKhcDYV7bKHxBNJVeWFeJWMJofNGWM+o94/jO9Y/uxPffxETyPn/zfXQeqqDUezlrp0PbVLIo89nKNPthZhhJZpELLncp1DXKO+gHMthHhqIDdvbgiVgRm1NZ+32vwJtEQ6pMWMXhm2Hv06u/vuRoXNfjBp77WpU3xJVnbDC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574633; c=relaxed/simple; bh=f0YR615m2QgME41ZUyooksZyyT/9mKV+05jqOFNdcZw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oG2RDJJoK+eTry59Odmw+q8NYRuATATIdHMClrUeCGpesmZF+MIQfb0NaNMxFtNqelNumt5R0WBd3Utr9ElSK53qaHHE1DkiczI7RuETN1cpDzjVwyudQCNCbvhVsf7/7YGeiIVFCnFENyM70NNEkUi+SKq3WuI73/GxR3+5+J0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=UNp7xFT2; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UNp7xFT2" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-424acf3226fso4433725e9.1 for ; Fri, 28 Jun 2024 04:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719574630; x=1720179430; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UwWX1BxAmFeGs34ZcghluLxqutvZVP2KEVsj6J0J/0c=; b=UNp7xFT2sOBaI3r2APh96XYGM1fCNGTmFBtcBuvKCl68SV/kHAtxm9z/31g3jkCKhO hsmlyIsl8TojS06OIvL5wO01ulXpuZdMV6ZyhxzGQPoCCl39VO6wyIh691cci033dNuI LiLWtLA1A/Yre1yvgi+52YLIK/VuZLkr0t/FSSnMM+xZvQBHHaM69asVy329qM2kkTaj 3InIbeC7oJLo2XbYlREU55uMKRYbGU+6pNP20xTS9KoVZQLz75uaeUd7pbDnNrGUOvzj 96IVkewsp4JXf7bAFYuse6QssTibPs2DZdVlq6h8tjpf/hTmnjF7I4qnCMtzARmH7cVW pv1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719574630; x=1720179430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UwWX1BxAmFeGs34ZcghluLxqutvZVP2KEVsj6J0J/0c=; b=AtThtbND5ho3dt9dvm2YJUQYYK5K2mOk6ovzNqMA7WV/d8Ogk75AALkRkWLgyhCGyI 19wOhLbaqhjGY6+e+O1depI0PBr0F9noIOMRJ35uSKLDubONfHyuIHVxaAILeoODnxG8 /Q9/X+j0tbB5N9M/GL7yJk9X5BKlcpGzf8Hppxsg76ppNuc1gffxx90WEyUz2YzCLk3s Q2+Xr2q4UW8s66/Q51HHsDK6SFIhSt8vNWetGhYNyH9hRhDOw1B+nz0SK4edX6cR3EoL UhxeaHEpvg+Bkzefaj8jfiqqntHAjFCPnufys59efxAxjth/dZSpllAgi6dTyIvmH4t5 VPnQ== X-Gm-Message-State: AOJu0YwX7bACdbRmsT3DZdlky0D60sOqbeNE0RAmA+vrmXxZduwaVI7t SJQI3P7oiMOkwqsGyp6L9Hlq9yIJCLgFrah9OT4WTHzyx4LX08V0W4JjPiI+uKg= X-Google-Smtp-Source: AGHT+IHQAPEuqCA3qwXGu6N+3+vFkEz2Q5fA7oNQ3wSkj2pPOLGorNhEGkU8syADGi1vAFMLoKOSZw== X-Received: by 2002:a05:600c:56cf:b0:423:6b7:55eb with SMTP id 5b1f17b1804b1-4248cc2b65cmr102647495e9.14.1719574630596; Fri, 28 Jun 2024 04:37:10 -0700 (PDT) Received: from srini-hackbase.lan ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0fba5asm2048937f8f.71.2024.06.28.04.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 04:37:09 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Joy Chakraborty , stable@vger.kernel.org, Dan Carpenter , Neil Armstrong , Srinivas Kandagatla Subject: [PATCH 2/4] nvmem: meson-efuse: Fix return value of nvmem callbacks Date: Fri, 28 Jun 2024 12:37:02 +0100 Message-Id: <20240628113704.13742-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> References: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1961; i=srinivas.kandagatla@linaro.org; h=from:subject; bh=xzCb2vl3xj3rdJauJ6cZLY2wKERo2kWjhl7YDaxZ4iE=; b=owEBbQGS/pANAwAKAXqh/VnHNFU3AcsmYgBmfqBTJvyc/Rp+GQmZ6rtTbXTrVdNH4uT4tvR8B 2OiQURtv5eJATMEAAEKAB0WIQQi509axvzi9vce3Y16of1ZxzRVNwUCZn6gUwAKCRB6of1ZxzRV N6GrCAC7kQG2q/QVs7FPXTnHOzKxNVncou+IuyA9IQIWyX1doLaa/wjLW411S6g9c38TMdNdY0+ 9LYLUPxDU5akyy4oucX+n3JnyAaY8FG4tfWpb7gzlx9/+dOKo0mzYUFIIcbYSKIzTN5sFuDh4GU oWNlQppCaJi46GbjO5YCR56mDGNdgm83TuROWn5Yux4vKS8z9Cb6Vh8u8MSSCtACahbKA2/wOtW X7NH9QIyvbEHfvz5fGOwDKlXKj0K3FwpfHciAf25DRRCNN0xWZYsQRYoUX47oK/UAQU25CVjSLh JQwKz7cvMYnLoDFyIzmvcEtvwxOAxxX7HAc/xHoVXFdS91tC X-Developer-Key: i=srinivas.kandagatla@linaro.org; a=openpgp; fpr=ED6472765AB36EC43B3EF97AD77E3FC0562560D6 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joy Chakraborty Read/write callbacks registered with nvmem core expect 0 to be returned on success and a negative value to be returned on failure. meson_efuse_read() and meson_efuse_write() call into meson_sm_call_read() and meson_sm_call_write() respectively which return the number of bytes read or written on success as per their api description. Fix to return error if meson_sm_call_read()/meson_sm_call_write() returns an error else return 0. Fixes: a29a63bdaf6f ("nvmem: meson-efuse: simplify read callback") Cc: stable@vger.kernel.org Signed-off-by: Joy Chakraborty Reviewed-by: Dan Carpenter Reviewed-by: Neil Armstrong Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/meson-efuse.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c index 33678d0af2c2..6c2f80e166e2 100644 --- a/drivers/nvmem/meson-efuse.c +++ b/drivers/nvmem/meson-efuse.c @@ -18,18 +18,24 @@ static int meson_efuse_read(void *context, unsigned int= offset, void *val, size_t bytes) { struct meson_sm_firmware *fw =3D context; + int ret; =20 - return meson_sm_call_read(fw, (u8 *)val, bytes, SM_EFUSE_READ, offset, - bytes, 0, 0, 0); + ret =3D meson_sm_call_read(fw, (u8 *)val, bytes, SM_EFUSE_READ, offset, + bytes, 0, 0, 0); + + return ret < 0 ? ret : 0; } =20 static int meson_efuse_write(void *context, unsigned int offset, void *val, size_t bytes) { struct meson_sm_firmware *fw =3D context; + int ret; + + ret =3D meson_sm_call_write(fw, (u8 *)val, bytes, SM_EFUSE_WRITE, offset, + bytes, 0, 0, 0); =20 - return meson_sm_call_write(fw, (u8 *)val, bytes, SM_EFUSE_WRITE, offset, - bytes, 0, 0, 0); + return ret < 0 ? ret : 0; } =20 static const struct of_device_id meson_efuse_match[] =3D { --=20 2.25.1 From nobody Sun Dec 14 12:17:04 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06E6B156C65 for ; Fri, 28 Jun 2024 11:37:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574636; cv=none; b=VzPDHv37Fa/3XIxufX4wzCZLJCvTXIbBZG0Xx4uj9WXVxCJnkDu7TGddFsyt9jch8AmI4cOJ4aqqJblbZtk1CESKXiquThC1uUOOxNrtyW9DL1Dilj/zoMOgKzbKRmp0wDo4qUnRexQAFLPGd5pIWckI90uGFw+VgQuESTUHvo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574636; c=relaxed/simple; bh=ye6FSQS/NKpcJzutp03vkmto5rrZ7PNX1AcZMkv0NpA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=dj8H1ghtNbmitQviyyMENLsmZXDc27UhYyNh4h5WM5iAuKgiAY/08K9IjuvZ5U4SJVpejnjiWFfhOBwVMVpCnM04SY8hOY4u/zjIxzyD9eFAT3daonl8ultdRRSevkmKK5RXOAJb6X4ZvpONDI5hIsSH8Le9D/hb3YGgUGe18OY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=DmzYwaw2; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DmzYwaw2" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-42562fde108so4626525e9.0 for ; Fri, 28 Jun 2024 04:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719574631; x=1720179431; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dllfp3FX/5YC/zss7njE9Wc54i5SAUNqTlCZuQW2zLE=; b=DmzYwaw2xUgSvCDAvmLXW7CPP3rcRSemkJTBvJouieSyjZzVKZWBhBJRn3TXBvT/JY guuZANHYJVoITlnrOWKlFt5rG2hUpXweTIA+cwv56MOsKkEBwRfxVUdvp5F+UHmXWITn kutoY9FwRO4bJara2AaYeBA8twHvgM2eEIP65K8ZqplilyKXsNxcKlnTyoSHpMQPHhwy pVxFeRAjr4aLiJ0fdwp4Qh3kBtTYd2AO7NzYb6lLu/H5TdNKusqwWPXPi4328h0goG3z +kW4UXUnNCwphvZ+dZ7yAvZoC9srMRDGORXgaOTGp2jWbyodu8gOh5BO3/GsvasxMCTP 7jPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719574631; x=1720179431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dllfp3FX/5YC/zss7njE9Wc54i5SAUNqTlCZuQW2zLE=; b=q1ihVnHk5DzUZo0A+oruQVEBKBT3nJA+VtYZxNGpwBgxpQbhoS/6/SN7vRKEciPUy/ fSPMxV4k7GwokCwqzD0OCu1orY9aQfr9ZsdTbIz9ffEU4O0oOUPR01sIb5lz3Cf5FJZE OdusH89DZZNLk0hexyvGTfxTpJxPIGaePHqFO77zdhnWOw5Q9RUWXN7nXCTqsaeedIeN M0SrrsDnc8MZJasHs+m81DVuRY2CATjzZEQxVs+F/Zh7FAyisgKb+mUBf0cT4IDfIgz1 RLxvwlS8sdhf3M57BBsfBUZgwH9m28Q0IgPhuKaNpiIFvd9h1FL3AIHduyH8F+xUi5Yz d3nw== X-Gm-Message-State: AOJu0YzenPovMmeXUgGkh2d+BQbVtu6pKTVGoY1xLXY/BclYfRTbz0eg MfQfZnzLwLEQYpJztM3UjY7If4RFrCAsOIkrlYFRxcFVGND5cgNt09A2i0jaY38= X-Google-Smtp-Source: AGHT+IEP8mJtr2lv0WyW5t8xLXDlcpnPJ7I1nJsFkBFMY1oOTNaTcrHwH+OH4b6EySrpeAIuc5h5HA== X-Received: by 2002:a05:600c:11:b0:425:6bea:8554 with SMTP id 5b1f17b1804b1-4256bea85ccmr13302165e9.27.1719574631518; Fri, 28 Jun 2024 04:37:11 -0700 (PDT) Received: from srini-hackbase.lan ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0fba5asm2048937f8f.71.2024.06.28.04.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 04:37:11 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 3/4] nvmem: core: only change name to fram for current attribute Date: Fri, 28 Jun 2024 12:37:03 +0100 Message-Id: <20240628113704.13742-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> References: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1211; i=srinivas.kandagatla@linaro.org; h=from:subject; bh=13iG1hG1MVP/pselTNqSmavmAZ1CPaJ78TUQIlJ1yGI=; b=owEBbAGT/pANAwAKAXqh/VnHNFU3AcsmYgBmfqBT+Em9xCEa/qzMWYgKZcaUN5HhiHE7IZ7SG u8x0i+hVciJATIEAAEKAB0WIQQi509axvzi9vce3Y16of1ZxzRVNwUCZn6gUwAKCRB6of1ZxzRV N8ToB/dXE+xVIc6GnZPcsWPb/lhvpTL21aR57RHEvfNxHSbmruA24nYginOnvL+gts3KVBRoQcN oQ1tGr1HHc38SWuZRlKOnhPsAL0vUSbsSHI5sRleisOjXF+DJpYeermvcCY8yUqGnKgeWyqYdHD 2ago7IDeH+HXdMeRnz/OGDT0XQC/4/lSMdb3qor2pUWznpFb/Hhfrl8RtbnD1RmMmbJOxgY6OKn Ez3Zq3IBOkh2i+giS3u4+pW9/EdwfugCtmh7c1z8R2+K0YVTfBGzqZbf5KxtLgX/LRYkpU/bVBl Q0+OQ0DwItpB1DuM8wcSQgy1BxVb0mU9iCyAKekJvTa2mEk= X-Developer-Key: i=srinivas.kandagatla@linaro.org; a=openpgp; fpr=ED6472765AB36EC43B3EF97AD77E3FC0562560D6 Content-Transfer-Encoding: quoted-printable From: Thomas Wei=C3=9Fschuh bin_attr_nvmem_eeprom_compat is the template from which all future compat attributes are created. Changing it means to change all subsquent compat attributes, too. Instead only use the "fram" name for the currently registered attribute. Fixes: fd307a4ad332 ("nvmem: prepare basics for FRAM support") Cc: stable@vger.kernel.org Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index e1ec3b7200d7..1285300ed239 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -396,10 +396,9 @@ static int nvmem_sysfs_setup_compat(struct nvmem_devic= e *nvmem, if (!config->base_dev) return -EINVAL; =20 - if (config->type =3D=3D NVMEM_TYPE_FRAM) - bin_attr_nvmem_eeprom_compat.attr.name =3D "fram"; - nvmem->eeprom =3D bin_attr_nvmem_eeprom_compat; + if (config->type =3D=3D NVMEM_TYPE_FRAM) + nvmem->eeprom.attr.name =3D "fram"; nvmem->eeprom.attr.mode =3D nvmem_bin_attr_get_umode(nvmem); nvmem->eeprom.size =3D nvmem->size; #ifdef CONFIG_DEBUG_LOCK_ALLOC --=20 2.25.1 From nobody Sun Dec 14 12:17:04 2025 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3FFE157488 for ; Fri, 28 Jun 2024 11:37:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574635; cv=none; b=SQ2ClwyNSkf9OI/0i+wYYwDeotLWw6WcMnBU3p0NTUloNwYFok4CFmokdbQbK8HGS3xTOE12nlu9AxyMAVMKA/cuUsBzHisSUeEylbND81G5XoQxci9TzEr/VuC5/Ey8el82kBvStFP+ChGhq/gTjwsyAGJiuOoWDleebJU91mg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719574635; c=relaxed/simple; bh=AB8J+iZrZaFjCJLdHR+aQydmJFfAV4W2jBf8xJ1slms=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=j+IvQFE82p0kvXH0xWJ5ExZarXYHaeMsQ5ZZnQwDLrcqG6YQu7Kh6++GslZIsiPuK43IlW87zwkBKgVMrQeYCyVSSfBM5+yuQDhgOTh1Srvg1YJNEmsszahzaOdV6Swso+o/NmioTcVuoxx0iTNUwU4UF/OXurto3q5jcfSNhXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=hHkMu8tY; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="hHkMu8tY" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-36703b0f914so357257f8f.0 for ; Fri, 28 Jun 2024 04:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719574632; x=1720179432; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xNA2Gh8U8LmpmJPYkwIg20NtTAEf9GOo0g5n9aJKVOE=; b=hHkMu8tYD+hyqDQ0nQY8Mek7H8gkGbaYIWblcDcfjP/loQ+1p+LpWdpxj4IuD55ruZ Nvt4Hz3jzKMbOGNIf05bVv1QE+jcOs3nj2G6Ne9FsDF8772rP7pP0XKHlOwzw5EBQjqT GzZDeutr6beTNoZNaFPfIItj4bvddxHvWBKUQwWtkmpSgd3C66RdADh0cv7Xfnp2eHaY TAnjH07xsSjAJaeFiyOOq3iCw+jcYcBG9BlsIC3Zgy0EYHC7k8NCGZzc7LWPFiUihJQI PmOzSEzsadxFH0jPGeQylaQ5zLJemevunJzTsy3YoI5CTPWdozzenwLkCGFXGKPcW1ak 3qgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719574632; x=1720179432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xNA2Gh8U8LmpmJPYkwIg20NtTAEf9GOo0g5n9aJKVOE=; b=Ix5bQAuAzidPkT1cTD69sEn2fDQ+MGfNC0Q8fYyLeVa70I2q0JMYTHA3KOnqAc6IUF QPg6TJy2B007B2BHmTYjSWD3EiSXzVREydkp/qLlhiwA4vrodanMKXhcDj9IMYxeG6tc dCs0hhaVpEH9FQw7kv6ZVOJyGMerKfcV7KOpq8mOmAtlSXjsn5OCzvwDptX0IWt2ecDt ubscFQ/3GeYIg8VpiBdF1TuJetupoZd3E05K7jQIsKvFKQdMNnVg8bqzGtSN47aNC5jL jlMKPf1kUSzt3yHlwWXY0WsOdzIFmgaMp81BrMEq/W7BYtznqA/erAGqsBdnhmlYwna2 YCOQ== X-Gm-Message-State: AOJu0YzkKReYHgq9++W6pyqUTisqgRubHAaRhgZGN3fKBNr0lwcosGZ/ /z/lYSX1Zp418dAzmDaFBdzQ5J4AgmdPUQLUvd/OqJig+mH9MNbJ33siojMDoCc= X-Google-Smtp-Source: AGHT+IEtQ2F/ZhnVsAtxFPenxSImh3RT49kp9cUCErX/CHqLmjJQdHe8xOXur99JwYwacWedK++COg== X-Received: by 2002:a5d:47c2:0:b0:366:df35:b64f with SMTP id ffacd0b85a97d-36760a62fb7mr1704746f8f.4.1719574632423; Fri, 28 Jun 2024 04:37:12 -0700 (PDT) Received: from srini-hackbase.lan ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0fba5asm2048937f8f.71.2024.06.28.04.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 04:37:12 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 4/4] nvmem: core: limit cell sysfs permissions to main attribute ones Date: Fri, 28 Jun 2024 12:37:04 +0100 Message-Id: <20240628113704.13742-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> References: <20240628113704.13742-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1143; i=srinivas.kandagatla@linaro.org; h=from:subject; bh=Y26lcDOMAGbcgW1j/vk529VAyqPSlMBhAzffwgYorYs=; b=owGbwMvMwMVYtfBv5HGTUHPG02pJDGl1C0JmKbU+Op1tfWi7YZZQjuqXsrcfn7eY/mf38PG9L CzxMUmwk9GYhYGRi0FWTJFF6bl/1LE/j759l7vbCzOIlQlkCgMXpwBMRCyG/X9Y2LTTp9nCVnTr ndli+m93dVaJd2PcSunc+07hdZtTYyavMTcpvHRB5sfuQEHJuctjiu/Yv9u9PvCfxdO6rddn6yv Y1Uz2PuOzKa3sWiPbm4Jn/zo2zlDbqu6m/Vf7abavbkaonfYsqe8KEj1zNbVTVVO+F0dWW/os0+ 0w1TF7zuxoojvTrc+uspjvVfh7R1MpkWRpdW3eKwFSsdIxqzn4jxRmKn98+5h5Q9wmNcffryI2/ Z3/J51BVeRkkpg7k/B0XnWtlQH+9+dE7jg0xdwj/Lx8s8KKCqUufl61FY6CNz126bV+dD6617p7 +SUjpueF5Z5dr3x/vdAo7/i566/HrbtbeVQ+7tu3Zs9aAA== X-Developer-Key: i=srinivas.kandagatla@linaro.org; a=openpgp; fpr=ED6472765AB36EC43B3EF97AD77E3FC0562560D6 Content-Transfer-Encoding: quoted-printable From: Thomas Wei=C3=9Fschuh The cell sysfs attribute should not provide more access to the nvmem data than the main attribute itself. For example if nvme_config::root_only was set, the cell attribute would still provide read access to everybody. Mask out permissions not available on the main attribute. Fixes: 0331c611949f ("nvmem: core: Expose cells through sysfs") Cc: stable@vger.kernel.org Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 1285300ed239..f8dd7eb40fbe 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -462,7 +462,7 @@ static int nvmem_populate_sysfs_cells(struct nvmem_devi= ce *nvmem) "%s@%x,%x", entry->name, entry->offset, entry->bit_offset); - attrs[i].attr.mode =3D 0444; + attrs[i].attr.mode =3D 0444 & nvmem_bin_attr_get_umode(nvmem); attrs[i].size =3D entry->bytes; attrs[i].read =3D &nvmem_cell_attr_read; attrs[i].private =3D entry; --=20 2.25.1