diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:40 +0100 |
| commit | 7a3f6e8d2096d244ad7080673497d43f15e08bdb (patch) | |
| tree | 822a121579242ba5e474e88c8146d07223f9c4c2 /net/bridge | |
| parent | 68921fb4be8e567565aa704350e858db1c470eff (diff) | |
| parent | e96c5550070c189a8ccb26dc6eae76ee8eef833d (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 51eab9b5baa1..9f70c267a7a5 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1912,7 +1912,8 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, int off, pad = 0; unsigned int size_kern, match_size = mwt->match_size; - strlcpy(name, mwt->u.name, sizeof(name)); + if (strscpy(name, mwt->u.name, sizeof(name)) < 0) + return -EINVAL; if (state->buf_kern_start) dst = state->buf_kern_start + state->buf_kern_offset; |