taskstats: cleanup reply assembling
PATCH 1/1 taskstats: cleanup reply assembling
Quoted 4 lines · Thomas Graf
nla_nest_start()may return NULL, either rely onprepare_reply()to be correct andBUG()on failure or do proper error handling for all functions.
nla_put() in taskstat.c can fail only if the 'size' argument of alloc_skb() was not right. This is a kernel bug, we should not hide it. So add 'BUG()' on error path and check for 'na == NULL'.
Quoted 2 lines
genlmsg_cancel()is only required in error paths for dumping procedures.
So we can remove 'genlmsg_cancel()' calls and 'void *reply' (saves 227 bytes).
kernel/taskstats.c renamed from kernel/taskstats.c~1_nla_bug +14 -19
@@ -69,7 +69,7 @@ enum actions { };static int prepare_reply (struct genl_info *info,u8 cmd,struct sk_buff **skbp, -void **replyp,size_t size) +size_t size) {struct sk_buff *skb;void *reply;
@@ -99,7 +99,6 @@ static int prepare_reply(struct genl_inf } *skbp = skb; - *replyp = reply;return 0 ; }
@@ -361,6 +360,8 @@ static struct taskstats *mk_reply(struct aggr =TASKSTATS_TYPE_AGGR_PID ; na =nla_nest_start (skb, aggr); +if (!na) + goto err;if (nla_put (skb, type,sizeof (pid), &pid) <0 ) goto err; ret =nla_reserve (skb,TASKSTATS_TYPE_STATS ,sizeof (struct taskstats ));
@@ -370,6 +371,7 @@ static struct taskstats *mk_reply(structreturn nla_data (ret); err: +BUG ();return NULL ; }
@@ -378,7 +380,6 @@ static int taskstats_user_cmd(struct sk_int rc =0 ;struct sk_buff *rep_skb;struct taskstats *stats; -void *reply;size_t size;cpumask_t mask;
@@ -400,7 +401,7 @@ static int taskstats_user_cmd(struct sk_ size =nla_total_size (sizeof (u32)) +nla_total_size (sizeof (struct taskstats )) +nla_total_size (0 ); - rc =prepare_reply (info,TASKSTATS_CMD_NEW , &rep_skb, &reply, size); + rc =prepare_reply (info,TASKSTATS_CMD_NEW , &rep_skb, size);if (rc <0 )return rc;
@@ -409,27 +410,24 @@ static int taskstats_user_cmd(struct sk_u32 pid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_PID ]); stats =mk_reply (rep_skb,TASKSTATS_TYPE_PID , pid);if (!stats) - goto nla_err; + goto err; rc =fill_pid (pid,NULL , stats);if (rc <0 ) - goto nla_err; + goto err; }else if (info->attrs[TASKSTATS_CMD_ATTR_TGID ]) {u32 tgid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_TGID ]); stats =mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tgid);if (!stats) - goto nla_err; + goto err; rc =fill_tgid (tgid,NULL , stats);if (rc <0 ) - goto nla_err; + goto err; }else goto err;return send_reply (rep_skb, info->snd_pid); - -nla_err: -genlmsg_cancel (rep_skb, reply); err:nlmsg_free (rep_skb);return rc;
@@ -466,7 +464,6 @@ void taskstats_exit(struct task_struct *struct listener_list *listeners;struct taskstats *stats;struct sk_buff *rep_skb; -void *reply;size_t size;int is_thread_group;
@@ -491,17 +488,17 @@ void taskstats_exit(struct task_struct *if (list_empty (&listeners->list))return ; - rc =prepare_reply (NULL ,TASKSTATS_CMD_NEW , &rep_skb, &reply, size); + rc =prepare_reply (NULL ,TASKSTATS_CMD_NEW , &rep_skb, size);if (rc <0 )return ; stats =mk_reply (rep_skb,TASKSTATS_TYPE_PID , tsk->pid);if (!stats) - goto nla_err; + goto err; rc =fill_pid (tsk->pid, tsk, stats);if (rc <0 ) - goto nla_err; + goto err;/* * Doesn't matter if tsk is the leader or the last group member leaving
@@ -511,16 +508,14 @@ void taskstats_exit(struct task_struct * stats =mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tsk->tgid);if (!stats) - goto nla_err; + goto err;memcpy (stats, tsk->signal->stats,sizeof (*stats)); send:send_cpu_listeners (rep_skb, listeners);return ; - -nla_err: -genlmsg_cancel (rep_skb, reply); +err:nlmsg_free (rep_skb); }
The same patch, but
- do not add 'BUG()' to the error path, Balbir and Shailabh disagree.
- use '?:' in mk_reply as Balbir suggested.
[PATCH] taskstats: cleanup reply assembling
Quoted 4 lines · Thomas Graf
nla_nest_start()may return NULL, either rely onprepare_reply()to be correct andBUG()on failure or do proper error handling for all functions.
Add a check for 'na == NULL' (this can't happen unless we mis-calculated the size).
Quoted 2 lines
genlmsg_cancel()is only required in error paths for dumping procedures.
Remove 'genlmsg_cancel()' calls and 'void *reply' (saves 227 bytes).
Quoted 9 lines · Balbir Singh
Review
Quoted 4 lines
(quoted diff) +3
-0+ aggr = TASKSTATS_TYPE_AGGR_TGID; + if (type == TASKSTATS_TYPE_PID) + aggr = TASKSTATS_TYPE_AGGR_PID;How about using
aggr = (type ==
TASKSTATS_TYPE_PID) ?TASKSTATS_TYPE_AGGR_PID:TASKSTATS_TYPE_AGGR_TGID;
Change mk_reply() to use '?:'.
kernel/taskstats.c renamed from kernel/taskstats.c~1_nla_bug +16 -22
@@ -69,7 +69,7 @@ enum actions { };static int prepare_reply (struct genl_info *info,u8 cmd,struct sk_buff **skbp, -void **replyp,size_t size) +size_t size) {struct sk_buff *skb;void *reply;
@@ -99,7 +99,6 @@ static int prepare_reply(struct genl_inf } *skbp = skb; - *replyp = reply;return 0 ; }
@@ -356,11 +355,13 @@ static struct taskstats *mk_reply(structstruct nlattr *na, *ret;int aggr; - aggr =TASKSTATS_TYPE_AGGR_TGID ; -if (type ==TASKSTATS_TYPE_PID ) - aggr =TASKSTATS_TYPE_AGGR_PID ; + aggr = (type ==TASKSTATS_TYPE_PID ) + ?TASKSTATS_TYPE_AGGR_PID + :TASKSTATS_TYPE_AGGR_TGID ; na =nla_nest_start (skb, aggr); +if (!na) + goto err;if (nla_put (skb, type,sizeof (pid), &pid) <0 ) goto err; ret =nla_reserve (skb,TASKSTATS_TYPE_STATS ,sizeof (struct taskstats ));
@@ -378,7 +379,6 @@ static int taskstats_user_cmd(struct sk_int rc =0 ;struct sk_buff *rep_skb;struct taskstats *stats; -void *reply;size_t size;cpumask_t mask;
@@ -400,7 +400,7 @@ static int taskstats_user_cmd(struct sk_ size =nla_total_size (sizeof (u32)) +nla_total_size (sizeof (struct taskstats )) +nla_total_size (0 ); - rc =prepare_reply (info,TASKSTATS_CMD_NEW , &rep_skb, &reply, size); + rc =prepare_reply (info,TASKSTATS_CMD_NEW , &rep_skb, size);if (rc <0 )return rc;
@@ -409,27 +409,24 @@ static int taskstats_user_cmd(struct sk_u32 pid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_PID ]); stats =mk_reply (rep_skb,TASKSTATS_TYPE_PID , pid);if (!stats) - goto nla_err; + goto err; rc =fill_pid (pid,NULL , stats);if (rc <0 ) - goto nla_err; + goto err; }else if (info->attrs[TASKSTATS_CMD_ATTR_TGID ]) {u32 tgid =nla_get_u32 (info->attrs[TASKSTATS_CMD_ATTR_TGID ]); stats =mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tgid);if (!stats) - goto nla_err; + goto err; rc =fill_tgid (tgid,NULL , stats);if (rc <0 ) - goto nla_err; + goto err; }else goto err;return send_reply (rep_skb, info->snd_pid); - -nla_err: -genlmsg_cancel (rep_skb, reply); err:nlmsg_free (rep_skb);return rc;
@@ -466,7 +463,6 @@ void taskstats_exit(struct task_struct *struct listener_list *listeners;struct taskstats *stats;struct sk_buff *rep_skb; -void *reply;size_t size;int is_thread_group;
@@ -491,17 +487,17 @@ void taskstats_exit(struct task_struct *if (list_empty (&listeners->list))return ; - rc =prepare_reply (NULL ,TASKSTATS_CMD_NEW , &rep_skb, &reply, size); + rc =prepare_reply (NULL ,TASKSTATS_CMD_NEW , &rep_skb, size);if (rc <0 )return ; stats =mk_reply (rep_skb,TASKSTATS_TYPE_PID , tsk->pid);if (!stats) - goto nla_err; + goto err; rc =fill_pid (tsk->pid, tsk, stats);if (rc <0 ) - goto nla_err; + goto err;/* * Doesn't matter if tsk is the leader or the last group member leaving
@@ -511,16 +507,14 @@ void taskstats_exit(struct task_struct * stats =mk_reply (rep_skb,TASKSTATS_TYPE_TGID , tsk->tgid);if (!stats) - goto nla_err; + goto err;memcpy (stats, tsk->signal->stats,sizeof (*stats)); send:send_cpu_listeners (rep_skb, listeners);return ; - -nla_err: -genlmsg_cancel (rep_skb, reply); +err:nlmsg_free (rep_skb); }