summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunchul Lee <hyc.lee@gmail.com>2021-07-12 19:34:02 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-31 08:19:38 +0200
commit302e1acd4c26a92d2679f91d13f368f7842c050e (patch)
tree61dbd703f2446c48bb51e20ce53aa0767cf4a2d8
parent02a470e3c64a0508052bd1268eff72bb7525e73e (diff)
downloadlinux-stable-302e1acd4c26a92d2679f91d13f368f7842c050e.tar.gz
linux-stable-302e1acd4c26a92d2679f91d13f368f7842c050e.tar.bz2
linux-stable-302e1acd4c26a92d2679f91d13f368f7842c050e.zip
cifs: fix the out of range assignment to bit fields in parse_server_interfaces
[ Upstream commit c9c9c6815f9004ee1ec87401ed0796853bd70f1b ] Because the out of range assignment to bit fields are compiler-dependant, the fields could have wrong value. Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/cifs/smb2ops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index bf6b4f71dc58..defee1d208d2 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -498,8 +498,8 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
p = buf;
while (bytes_left >= sizeof(*p)) {
info->speed = le64_to_cpu(p->LinkSpeed);
- info->rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE);
- info->rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE);
+ info->rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE) ? 1 : 0;
+ info->rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE) ? 1 : 0;
cifs_dbg(FYI, "%s: adding iface %zu\n", __func__, *iface_count);
cifs_dbg(FYI, "%s: speed %zu bps\n", __func__, info->speed);