Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi

[mv-sheeva.git] / drivers / scsi / scsi_netlink.c

diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 44f76e8b58af62a13467e9dc4e080c9e21584e68..c77628afbf9f3e4dbb53c76e6ccf30b054b0f28a 100644 (file)
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -112,7 +112,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
                        goto next_msg;
                }
 
-               if (security_netlink_recv(skb, CAP_SYS_ADMIN)) {
+               if (!capable(CAP_SYS_ADMIN)) {
                        err = -EPERM;
                        goto next_msg;
                }