Skip to contentSkip to conversation

modifying array initializers?

Cocci Johannes Berg 2 participants 7 messages Apr 21, 2017

lore
Share & tools
lore
#0 lore raw

Hi,

I'm exploring backporting the netlink error reporting stuff from Linux in backports. I have this:

static __genl_const struct genl_ops nl80211_ops[] = { ????????{
????????????????.cmd = NL80211_CMD_GET_WIPHY, ????????????????.doit = nl80211_get_wiphy, ????????????????.dumpit = nl80211_dump_wiphy, ????????????????.done = nl80211_dump_wiphy_done, ????????????????.policy = nl80211_policy, ????????????????/* can be retrieved by unprivileged users */ ????????????????.internal_flags = NL80211_FLAG_NEED_WIPHY | ??????????????????????????????????NL80211_FLAG_NEED_RTNL, ????????},
????????{
????????????????.cmd = NL80211_CMD_SET_WIPHY, ????????????????.doit = nl80211_set_wiphy, ????????????????.policy = nl80211_policy, ????????????????.flags = GENL_UNS_ADMIN_PERM, ????????????????.internal_flags = NL80211_FLAG_NEED_RTNL, ????????},

	[...]
};

and would like to wrap all the .doit calls.

This works for the first instance, but I can't seem to figure out if it's possible to apply to each one:

@@
identifier fn;
fresh identifier wrap_fn = "_wrap_" ## fn;
@@
+static int wrap_fn(struct sk_buff *skb, struct genl_info *info) +{
+???????return fn(skb, info);
+}
static struct genl_ops nl80211_ops[] = {
????????{
-???????????????.doit = fn,
+???????????????.doit = wrap_fn,
????????????????...
????????},
????????...
};

Is there a way to loop over all the initializers?

johannes

#1 lore raw
Quoted 39 lines · Johannes Berg

Hi,

I'm exploring backporting the netlink error reporting stuff from Linux in backports. I have this:

static __genl_const struct genl_ops nl80211_ops[] = { ????????{
????????????????.cmd = NL80211_CMD_GET_WIPHY, ????????????????.doit = nl80211_get_wiphy, ????????????????.dumpit = nl80211_dump_wiphy, ????????????????.done = nl80211_dump_wiphy_done, ????????????????.policy = nl80211_policy, ????????????????/* can be retrieved by unprivileged users */ ????????????????.internal_flags = NL80211_FLAG_NEED_WIPHY | ??????????????????????????????????NL80211_FLAG_NEED_RTNL, ????????},
????????{
????????????????.cmd = NL80211_CMD_SET_WIPHY, ????????????????.doit = nl80211_set_wiphy, ????????????????.policy = nl80211_policy, ????????????????.flags = GENL_UNS_ADMIN_PERM, ????????????????.internal_flags = NL80211_FLAG_NEED_RTNL, ????????},

	[...]
};

and would like to wrap all the .doit calls.

This works for the first instance, but I can't seem to figure out if it's possible to apply to each one:

@@
identifier fn;
fresh identifier wrap_fn = "_wrap_" ## fn;
@@

(quoted diff) +4 -0
+static int wrap_fn(struct sk_buff *skb, struct genl_info *info)
+{
+???????return fn(skb, info);
+}
Quoted 1 line

static struct genl_ops nl80211_ops[] = {

Just add ..., here (note the comma at the end).

julia

Quoted 16 lines

????????{
-???????????????.doit = fn,
+???????????????.doit = wrap_fn,
????????????????...
????????},
????????...
};

Is there a way to loop over all the initializers?

johannes
_______________________________________________
Cocci mailing list
Cocci at systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci

#2 lore raw
Quoted 2 lines · Julia Lawall

Just add ..., here (note the comma at the end).

I thought I tried that, but maybe not. It doesn't work - at least in my version - though:

HANDLING: net/wireless/nl80211.c
?????
previous modification:

? <<< static int wrap_fn(struct sk_buff *skb, struct genl_info *info) ? <<< {
? <<< return fn(skb, info);
? <<< }
? <<<?
CONTEXT
According to environment 2:
???rule starting on line 1.wrap_fn -> id _wrap_nl80211_wiphy_netns ???rule starting on line 1.fn -> id nl80211_wiphy_netns

current modification:

? <<< static int wrap_fn(struct sk_buff *skb, struct genl_info *info) ? <<< {
? <<< return fn(skb, info);
? <<< }
? <<<?
CONTEXT
According to environment 2:
???rule starting on line 1.wrap_fn -> id _wrap_nl80211_vendor_cmd ???rule starting on line 1.fn -> id nl80211_vendor_cmd

Fatal error: exception Failure("rule starting on line 1: already tagged fake token\n")

Sounds like it doesn't like to add multiple things here, let me think about how to work around that.

johannes

#3 lore raw
Quoted 33 lines · Johannes Berg
Quoted 2 lines · Julia Lawall

Just add ..., here (note the comma at the end).

I thought I tried that, but maybe not. It doesn't work - at least in my version - though:

HANDLING: net/wireless/nl80211.c
?????
previous modification:

? <<< static int wrap_fn(struct sk_buff *skb, struct genl_info *info) ? <<< {
? <<< return fn(skb, info);
? <<< }
? <<<?
CONTEXT
According to environment 2:
???rule starting on line 1.wrap_fn -> id _wrap_nl80211_wiphy_netns ???rule starting on line 1.fn -> id nl80211_wiphy_netns

current modification:

? <<< static int wrap_fn(struct sk_buff *skb, struct genl_info *info) ? <<< {
? <<< return fn(skb, info);
? <<< }
? <<<?
CONTEXT
According to environment 2:
???rule starting on line 1.wrap_fn -> id _wrap_nl80211_vendor_cmd ???rule starting on line 1.fn -> id nl80211_vendor_cmd

Quoted 6 lines

Fatal error: exception Failure("rule starting on line 1: already tagged fake token\n")

Sounds like it doesn't like to add multiple things here, let me think about how to work around that.

If you don't find a solution, send back the rule and the code that causes trouble, and I will take a look.

julia

#4 lore raw
Quoted 6 lines
Quoted 3 lines

Sounds like it doesn't like to add multiple things here, let me think about how to work around that.

If you don't find a solution, send back the rule and the code that causes trouble, and I will take a look.

I tried for a while now, but didn't find one. I think the problem is that it's evaluating all of these things at once, and then it doesn't know how to place two of the new wrap_fn functions when they both should go before nl80211_ops[].

The code is net/wireless/n80211.c, and my current version of the spatch, as you suggested, is this:

@@
identifier fn;
fresh identifier wrap_fn = "_wrap_" ## fn;
@@
+static int wrap_fn(struct sk_buff *skb, struct genl_info *info) +{
+ return fn(skb, info);
+}
+

static struct genl_ops nl80211_ops[] = {
        ...,
        {
-               .doit = fn,
+               .doit = wrap_fn,
                ...
        },
        ...
};

It *does* work to match multiple .doit instances now, but it seems to get confused when trying to place more than one wrap_fn right before nl80211_ops[].

I tried pulling it out into a separate rule, attaching it to some other token, e.g. after nl80211_post_doit(), but I can't seem to get that to work.

johannes

#5 lore raw
Quoted 20 lines · Johannes Berg
Quoted 6 lines
Quoted 3 lines

Sounds like it doesn't like to add multiple things here, let me think about how to work around that.

If you don't find a solution, send back the rule and the code that causes trouble, and I will take a look.

I tried for a while now, but didn't find one. I think the problem is that it's evaluating all of these things at once, and then it doesn't know how to place two of the new wrap_fn functions when they both should go before nl80211_ops[].

The code is net/wireless/n80211.c, and my current version of the spatch, as you suggested, is this:

@@
identifier fn;
fresh identifier wrap_fn = "_wrap_" ## fn;
@@

Review

Quoted 5 lines
(quoted diff) +5 -0
+static int wrap_fn(struct sk_buff *skb, struct genl_info *info)
+{
+       return fn(skb, info);
+}
+

Use ++ instead. You may need to put the new function all on one line.

julia

Quoted 21 lines
static struct genl_ops nl80211_ops[] = {
        ...,
        {
(quoted diff) +1 -1
-               .doit = fn,
+               .doit = wrap_fn,
...
        },
...

};

It *does* work to match multiple .doit instances now, but it seems to get confused when trying to place more than one wrap_fn right before nl80211_ops[].

I tried pulling it out into a separate rule, attaching it to some other token, e.g. after nl80211_post_doit(), but I can't seem to get that to work.

johannes

#6 lore raw
Quoted 4 lines · Julia Lawall
Quoted 4 lines

@@
identifier fn;
fresh identifier wrap_fn = "_wrap_" ## fn;
@@

Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+static int wrap_fn(struct sk_buff *skb, struct genl_info *info)
+{
+???????return fn(skb, info);
+}
+

Use ++ instead.??You may need to put the new function all on one line.

Indeed, that works (and yes, I had to put it on a single line)

Thanks!

johannes