Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 93c1af6ca94c1e763efba76a127b5c135e3d23a6

Authored by Eric Dumazet
Committed by David S. Miller
1 parent acde2c2d28
Exists in smarc_imx_lf-5.15.y and in 32 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y

net:rfs: adjust table size checking 

Make sure root user does not try something stupid.

Also make sure mask field in struct rps_sock_flow_table
does not share a cache line with the potentially often dirtied
flow table.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 567e4b79731c ("net: rfs: add hash collision detection")
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

include/linux/netdevice.h
Diff comments   View file @ 93c1af6
... ... @@ -653,7 +653,8 @@
653 653 */
654 654 struct rps_sock_flow_table {
655 655 u32 mask;
656   - u32 ents[0];
  656 +
  657 + u32 ents[0] ____cacheline_aligned_in_smp;
657 658 };
658 659 #define RPS_SOCK_FLOW_TABLE_SIZE(_num) (offsetof(struct rps_sock_flow_table, ents[_num]))
659 660  
net/core/sysctl_net_core.c
Diff comments   View file @ 93c1af6
... ... @@ -52,7 +52,7 @@
52 52  
53 53 if (write) {
54 54 if (size) {
55   - if (size > 1<<30) {
  55 + if (size > 1<<29) {
56 56 /* Enforce limit to prevent overflow */
57 57 mutex_unlock(&sock_flow_mutex);
58 58 return -EINVAL;