tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

apparmor: remove af_select macro

The af_select macro just adds a layer of unnecessary abstraction that
makes following what the code is doing harder.

Signed-off-by: John Johansen <john.johansen@canonical.com>

John Johansen 9045aa25 ce9e3b3f

+9 -36
-10
security/apparmor/include/net.h
··· 73 73 (SK)->sk_protocol) 74 74 75 75 76 - #define af_select(FAMILY, FN, DEF_FN) \ 77 - ({ \ 78 - int __e; \ 79 - switch ((FAMILY)) { \ 80 - default: \ 81 - __e = DEF_FN; \ 82 - } \ 83 - __e; \ 84 - }) 85 - 86 76 struct aa_secmark { 87 77 u8 audit; 88 78 u8 deny;
+9 -26
security/apparmor/lsm.c
··· 1097 1097 1098 1098 label = begin_current_label_crit_section(); 1099 1099 if (!(kern || unconfined(label))) 1100 - error = af_select(family, 1101 - create_perm(label, family, type, protocol), 1102 - aa_af_perm(current_cred(), label, 1103 - OP_CREATE, AA_MAY_CREATE, 1104 - family, type, protocol)); 1100 + error = aa_af_perm(current_cred(), label, OP_CREATE, 1101 + AA_MAY_CREATE, family, type, protocol); 1105 1102 end_current_label_crit_section(label); 1106 1103 1107 1104 return error; ··· 1147 1150 AA_BUG(!address); 1148 1151 AA_BUG(in_interrupt()); 1149 1152 1150 - return af_select(sock->sk->sk_family, 1151 - bind_perm(sock, address, addrlen), 1152 - aa_sk_perm(OP_BIND, AA_MAY_BIND, sock->sk)); 1153 + return aa_sk_perm(OP_BIND, AA_MAY_BIND, sock->sk); 1153 1154 } 1154 1155 1155 1156 static int apparmor_socket_connect(struct socket *sock, ··· 1158 1163 AA_BUG(!address); 1159 1164 AA_BUG(in_interrupt()); 1160 1165 1161 - return af_select(sock->sk->sk_family, 1162 - connect_perm(sock, address, addrlen), 1163 - aa_sk_perm(OP_CONNECT, AA_MAY_CONNECT, sock->sk)); 1166 + return aa_sk_perm(OP_CONNECT, AA_MAY_CONNECT, sock->sk); 1164 1167 } 1165 1168 1166 1169 static int apparmor_socket_listen(struct socket *sock, int backlog) ··· 1167 1174 AA_BUG(!sock->sk); 1168 1175 AA_BUG(in_interrupt()); 1169 1176 1170 - return af_select(sock->sk->sk_family, 1171 - listen_perm(sock, backlog), 1172 - aa_sk_perm(OP_LISTEN, AA_MAY_LISTEN, sock->sk)); 1177 + return aa_sk_perm(OP_LISTEN, AA_MAY_LISTEN, sock->sk); 1173 1178 } 1174 1179 1175 1180 /* ··· 1181 1190 AA_BUG(!newsock); 1182 1191 AA_BUG(in_interrupt()); 1183 1192 1184 - return af_select(sock->sk->sk_family, 1185 - accept_perm(sock, newsock), 1186 - aa_sk_perm(OP_ACCEPT, AA_MAY_ACCEPT, sock->sk)); 1193 + return aa_sk_perm(OP_ACCEPT, AA_MAY_ACCEPT, sock->sk); 1187 1194 } 1188 1195 1189 1196 static int aa_sock_msg_perm(const char *op, u32 request, struct socket *sock, ··· 1192 1203 AA_BUG(!msg); 1193 1204 AA_BUG(in_interrupt()); 1194 1205 1195 - return af_select(sock->sk->sk_family, 1196 - msg_perm(op, request, sock, msg, size), 1197 - aa_sk_perm(op, request, sock->sk)); 1206 + return aa_sk_perm(op, request, sock->sk); 1198 1207 } 1199 1208 1200 1209 static int apparmor_socket_sendmsg(struct socket *sock, ··· 1214 1227 AA_BUG(!sock->sk); 1215 1228 AA_BUG(in_interrupt()); 1216 1229 1217 - return af_select(sock->sk->sk_family, 1218 - sock_perm(op, request, sock), 1219 - aa_sk_perm(op, request, sock->sk)); 1230 + return aa_sk_perm(op, request, sock->sk); 1220 1231 } 1221 1232 1222 1233 static int apparmor_socket_getsockname(struct socket *sock) ··· 1235 1250 AA_BUG(!sock->sk); 1236 1251 AA_BUG(in_interrupt()); 1237 1252 1238 - return af_select(sock->sk->sk_family, 1239 - opt_perm(op, request, sock, level, optname), 1240 - aa_sk_perm(op, request, sock->sk)); 1253 + return aa_sk_perm(op, request, sock->sk); 1241 1254 } 1242 1255 1243 1256 static int apparmor_socket_getsockopt(struct socket *sock, int level,