diff --git a/[refs] b/[refs] index 3d8c7ed2d323..801b70930f14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aae8738473b7447284fe370d4e6816c02b4511b +refs/heads/master: 1acc04cd4c0b54ada85d0dd5d7c5efc3441261bf diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h index d6f4ec467a4b..53553c99cad6 100644 --- a/trunk/include/linux/dccp.h +++ b/trunk/include/linux/dccp.h @@ -191,7 +191,7 @@ enum { /* this structure is argument to DCCP_SOCKOPT_CHANGE_X */ struct dccp_so_feat { __u8 dccpsf_feat; - __u8 *dccpsf_val; + __u8 __user *dccpsf_val; __u8 dccpsf_len; };