diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
| commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
| tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /net/ipv6/ip6mr.c | |
| parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
| parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) | |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 52e0f74fdfe0..23e4ac0cc30e 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
| @@ -1113,6 +1113,9 @@ static int ip6mr_mfc_add(struct net *net, struct mf6cctl *mfc, int mrtsock) | |||
| 1113 | unsigned char ttls[MAXMIFS]; | 1113 | unsigned char ttls[MAXMIFS]; |
| 1114 | int i; | 1114 | int i; |
| 1115 | 1115 | ||
| 1116 | if (mfc->mf6cc_parent >= MAXMIFS) | ||
| 1117 | return -ENFILE; | ||
| 1118 | |||
| 1116 | memset(ttls, 255, MAXMIFS); | 1119 | memset(ttls, 255, MAXMIFS); |
| 1117 | for (i = 0; i < MAXMIFS; i++) { | 1120 | for (i = 0; i < MAXMIFS; i++) { |
| 1118 | if (IF_ISSET(i, &mfc->mf6cc_ifset)) | 1121 | if (IF_ISSET(i, &mfc->mf6cc_ifset)) |