2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 73c55ccb629a..22538d9628f1 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2000,7 +2000,7 @@ static struct cn_handler_struct cnd_table[] = {
         [ P_new_c_uuid ]        = { &drbd_nl_new_c_uuid,        0 },
 };
 
-static void drbd_connector_callback(struct cn_msg *req)
+static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms *nsp)
 {
         struct drbd_nl_cfg_req *nlp = (struct drbd_nl_cfg_req *)req->data;
         struct cn_handler_struct *cm;
@@ -2017,6 +2017,11 @@ static void drbd_connector_callback(struct cn_msg *req)
                 return;
         }
 
+        if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN)) {
+                retcode = ERR_PERM;
+                goto fail;
+        }
+
         mdev = ensure_mdev(nlp);
         if (!mdev) {
                 retcode = ERR_MINOR_INVALID;
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 69dc711f37b3..233db5c18b86 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -138,6 +138,7 @@ enum drbd_ret_codes {
         ERR_VERIFY_RUNNING      = 149, /* DRBD 8.2 only */
         ERR_DATA_NOT_CURRENT    = 150,
         ERR_CONNECTED           = 151, /* DRBD 8.3 only */
+        ERR_PERM                = 152,
 
         /* insert new ones above this line */
         AFTER_LAST_ERR_CODE