* [PATCH] infiniband: add checks for the status of nla_put
@ 2018-12-26 2:11 Kangjie Lu
2018-12-26 19:49 ` Leon Romanovsky
0 siblings, 1 reply; 2+ messages in thread
From: Kangjie Lu @ 2018-12-26 2:11 UTC (permalink / raw)
To: kjlu
Cc: pakki001, Doug Ledford, Jason Gunthorpe, Leon Romanovsky,
Parav Pandit, Dennis Dalessandro, Artemy Kovalyov, Alex Estrin,
linux-rdma, linux-kernel
The fix inserts multiple checks for nla_put, and issues warnings if it
fails.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
drivers/infiniband/core/sa_query.c | 39 ++++++++++++++++++------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index be5ba5e15496..0e5d7a6dde36 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -775,28 +775,37 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb,
/* Now build the attributes */
if (comp_mask & IB_SA_PATH_REC_SERVICE_ID) {
val64 = be64_to_cpu(sa_rec->service_id);
- nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SERVICE_ID,
- sizeof(val64), &val64);
+ if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SERVICE_ID,
+ sizeof(val64), &val64))
+ pr_warn("nla_put failed\n");
+ }
+ if (comp_mask & IB_SA_PATH_REC_DGID) {
+ if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_DGID,
+ sizeof(sa_rec->dgid), &sa_rec->dgid))
+ pr_warn("nla_put failed\n");
+ }
+ if (comp_mask & IB_SA_PATH_REC_SGID) {
+ if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SGID,
+ sizeof(sa_rec->sgid), &sa_rec->sgid))
+ pr_warn("nla_put failed\n");
+ }
+ if (comp_mask & IB_SA_PATH_REC_TRAFFIC_CLASS) {
+ if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_TCLASS,
+ sizeof(sa_rec->traffic_class), &sa_rec->traffic_class))
+ pr_warn("nla_put failed\n");
}
- if (comp_mask & IB_SA_PATH_REC_DGID)
- nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_DGID,
- sizeof(sa_rec->dgid), &sa_rec->dgid);
- if (comp_mask & IB_SA_PATH_REC_SGID)
- nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SGID,
- sizeof(sa_rec->sgid), &sa_rec->sgid);
- if (comp_mask & IB_SA_PATH_REC_TRAFFIC_CLASS)
- nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_TCLASS,
- sizeof(sa_rec->traffic_class), &sa_rec->traffic_class);
if (comp_mask & IB_SA_PATH_REC_PKEY) {
val16 = be16_to_cpu(sa_rec->pkey);
- nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_PKEY,
- sizeof(val16), &val16);
+ if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_PKEY,
+ sizeof(val16), &val16))
+ pr_warn("nla_put failed\n");
}
if (comp_mask & IB_SA_PATH_REC_QOS_CLASS) {
val16 = be16_to_cpu(sa_rec->qos_class);
- nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_QOS_CLASS,
- sizeof(val16), &val16);
+ if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_QOS_CLASS,
+ sizeof(val16), &val16))
+ pr_warn("nla_put failed\n");
}
}
--
2.17.2 (Apple Git-113)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] infiniband: add checks for the status of nla_put
2018-12-26 2:11 [PATCH] infiniband: add checks for the status of nla_put Kangjie Lu
@ 2018-12-26 19:49 ` Leon Romanovsky
0 siblings, 0 replies; 2+ messages in thread
From: Leon Romanovsky @ 2018-12-26 19:49 UTC (permalink / raw)
To: Kangjie Lu
Cc: pakki001, Doug Ledford, Jason Gunthorpe, Parav Pandit,
Dennis Dalessandro, Artemy Kovalyov, Alex Estrin, linux-rdma,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2902 bytes --]
On Tue, Dec 25, 2018 at 08:11:39PM -0600, Kangjie Lu wrote:
> The fix inserts multiple checks for nla_put, and issues warnings if it
> fails.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
I didn't look very close, but it strange that failure in nla_put()
doesn't follow by canceling of netlink message.
Plus extensive usage of pr_warn() is not needed here.
Thanks
> drivers/infiniband/core/sa_query.c | 39 ++++++++++++++++++------------
> 1 file changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
> index be5ba5e15496..0e5d7a6dde36 100644
> --- a/drivers/infiniband/core/sa_query.c
> +++ b/drivers/infiniband/core/sa_query.c
> @@ -775,28 +775,37 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb,
> /* Now build the attributes */
> if (comp_mask & IB_SA_PATH_REC_SERVICE_ID) {
> val64 = be64_to_cpu(sa_rec->service_id);
> - nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SERVICE_ID,
> - sizeof(val64), &val64);
> + if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SERVICE_ID,
> + sizeof(val64), &val64))
> + pr_warn("nla_put failed\n");
> + }
> + if (comp_mask & IB_SA_PATH_REC_DGID) {
> + if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_DGID,
> + sizeof(sa_rec->dgid), &sa_rec->dgid))
> + pr_warn("nla_put failed\n");
> + }
> + if (comp_mask & IB_SA_PATH_REC_SGID) {
> + if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SGID,
> + sizeof(sa_rec->sgid), &sa_rec->sgid))
> + pr_warn("nla_put failed\n");
> + }
> + if (comp_mask & IB_SA_PATH_REC_TRAFFIC_CLASS) {
> + if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_TCLASS,
> + sizeof(sa_rec->traffic_class), &sa_rec->traffic_class))
> + pr_warn("nla_put failed\n");
> }
> - if (comp_mask & IB_SA_PATH_REC_DGID)
> - nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_DGID,
> - sizeof(sa_rec->dgid), &sa_rec->dgid);
> - if (comp_mask & IB_SA_PATH_REC_SGID)
> - nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SGID,
> - sizeof(sa_rec->sgid), &sa_rec->sgid);
> - if (comp_mask & IB_SA_PATH_REC_TRAFFIC_CLASS)
> - nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_TCLASS,
> - sizeof(sa_rec->traffic_class), &sa_rec->traffic_class);
>
> if (comp_mask & IB_SA_PATH_REC_PKEY) {
> val16 = be16_to_cpu(sa_rec->pkey);
> - nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_PKEY,
> - sizeof(val16), &val16);
> + if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_PKEY,
> + sizeof(val16), &val16))
> + pr_warn("nla_put failed\n");
> }
> if (comp_mask & IB_SA_PATH_REC_QOS_CLASS) {
> val16 = be16_to_cpu(sa_rec->qos_class);
> - nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_QOS_CLASS,
> - sizeof(val16), &val16);
> + if (nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_QOS_CLASS,
> + sizeof(val16), &val16))
> + pr_warn("nla_put failed\n");
> }
> }
>
> --
> 2.17.2 (Apple Git-113)
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-26 19:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-26 2:11 [PATCH] infiniband: add checks for the status of nla_put Kangjie Lu
2018-12-26 19:49 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox