2 files changed, 10 insertions, 0 deletions

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index d5e54e944f72..e69d136eeaf6 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -391,6 +391,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f)
         case AUDIT_SUBJ_CLR:
         case AUDIT_OBJ_LEV_LOW:
         case AUDIT_OBJ_LEV_HIGH:
+        case AUDIT_SADDR_FAM:
                 /* bit ops are only useful on syscall args */
                 if (f->op == Audit_bitmask || f->op == Audit_bittest)
                         return -EINVAL;
@@ -438,6 +439,10 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f)
                 if (f->val > AUDIT_MAX_FIELD_COMPARE)
                         return -EINVAL;
                 break;
+        case AUDIT_SADDR_FAM:
+                if (f->val >= AF_MAX)
+                        return -EINVAL;
+                break;
         default:
                 break;
         }
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 30aa07b0115f..9134fe11ff6c 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -615,6 +615,11 @@ static int audit_filter_rules(struct task_struct *tsk,
                 case AUDIT_LOGINUID_SET:
                         result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val);
                         break;
+                case AUDIT_SADDR_FAM:
+                        if (ctx->sockaddr)
+                                result = audit_comparator(ctx->sockaddr->ss_family,
+                                                          f->op, f->val);
+                        break;
                 case AUDIT_SUBJ_USER:
                 case AUDIT_SUBJ_ROLE:
                 case AUDIT_SUBJ_TYPE: