projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
tty_audit.c
diff --git
a/drivers/tty/tty_audit.c
b/drivers/tty/tty_audit.c
index ea2e5ad71731915960f37b7d1119fa6fdacbbdee..a4fdce74f883e4f5868f3efb975ec51347ef2c47 100644
(file)
--- a/
drivers/tty/tty_audit.c
+++ b/
drivers/tty/tty_audit.c
@@
-112,10
+112,8
@@
void tty_audit_exit(void)
{
struct tty_audit_buf *buf;
{
struct tty_audit_buf *buf;
- spin_lock_irq(¤t->sighand->siglock);
buf = current->signal->tty_audit_buf;
current->signal->tty_audit_buf = NULL;
buf = current->signal->tty_audit_buf;
current->signal->tty_audit_buf = NULL;
- spin_unlock_irq(¤t->sighand->siglock);
if (!buf)
return;
if (!buf)
return;
@@
-133,9
+131,8
@@
void tty_audit_exit(void)
*/
void tty_audit_fork(struct signal_struct *sig)
{
*/
void tty_audit_fork(struct signal_struct *sig)
{
- spin_lock_irq(¤t->sighand->siglock);
sig->audit_tty = current->signal->audit_tty;
sig->audit_tty = current->signal->audit_tty;
- s
pin_unlock_irq(¤t->sighand->siglock)
;
+ s
ig->audit_tty_log_passwd = current->signal->audit_tty_log_passwd
;
}
/**
}
/**
@@
-145,13
+142,14
@@
void tty_audit_tiocsti(struct tty_struct *tty, char ch)
{
struct tty_audit_buf *buf;
int major, minor, should_audit;
{
struct tty_audit_buf *buf;
int major, minor, should_audit;
+ unsigned long flags;
- spin_lock_irq
(¤t->sighand->siglock
);
+ spin_lock_irq
save(¤t->sighand->siglock, flags
);
should_audit = current->signal->audit_tty;
buf = current->signal->tty_audit_buf;
if (buf)
atomic_inc(&buf->count);
should_audit = current->signal->audit_tty;
buf = current->signal->tty_audit_buf;
if (buf)
atomic_inc(&buf->count);
- spin_unlock_irq
(¤t->sighand->siglock
);
+ spin_unlock_irq
restore(¤t->sighand->siglock, flags
);
major = tty->driver->major;
minor = tty->driver->minor_start + tty->index;
major = tty->driver->major;
minor = tty->driver->minor_start + tty->index;
@@
-221,10
+219,11
@@
static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
unsigned icanon)
{
struct tty_audit_buf *buf, *buf2;
unsigned icanon)
{
struct tty_audit_buf *buf, *buf2;
+ unsigned long flags;
buf = NULL;
buf2 = NULL;
buf = NULL;
buf2 = NULL;
- spin_lock_irq
(¤t->sighand->siglock
);
+ spin_lock_irq
save(¤t->sighand->siglock, flags
);
if (likely(!current->signal->audit_tty))
goto out;
buf = current->signal->tty_audit_buf;
if (likely(!current->signal->audit_tty))
goto out;
buf = current->signal->tty_audit_buf;
@@
-232,7
+231,7
@@
static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
atomic_inc(&buf->count);
goto out;
}
atomic_inc(&buf->count);
goto out;
}
- spin_unlock_irq
(¤t->sighand->siglock
);
+ spin_unlock_irq
restore(¤t->sighand->siglock, flags
);
buf2 = tty_audit_buf_alloc(tty->driver->major,
tty->driver->minor_start + tty->index,
buf2 = tty_audit_buf_alloc(tty->driver->major,
tty->driver->minor_start + tty->index,
@@
-242,7
+241,7
@@
static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
return NULL;
}
return NULL;
}
- spin_lock_irq
(¤t->sighand->siglock
);
+ spin_lock_irq
save(¤t->sighand->siglock, flags
);
if (!current->signal->audit_tty)
goto out;
buf = current->signal->tty_audit_buf;
if (!current->signal->audit_tty)
goto out;
buf = current->signal->tty_audit_buf;
@@
-254,7
+253,7
@@
static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
atomic_inc(&buf->count);
/* Fall through */
out:
atomic_inc(&buf->count);
/* Fall through */
out:
- spin_unlock_irq
(¤t->sighand->siglock
);
+ spin_unlock_irq
restore(¤t->sighand->siglock, flags
);
if (buf2)
tty_audit_buf_free(buf2);
return buf;
if (buf2)
tty_audit_buf_free(buf2);
return buf;
@@
-270,10
+269,18
@@
void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
{
struct tty_audit_buf *buf;
int major, minor;
{
struct tty_audit_buf *buf;
int major, minor;
+ int audit_log_tty_passwd;
+ unsigned long flags;
if (unlikely(size == 0))
return;
if (unlikely(size == 0))
return;
+ spin_lock_irqsave(¤t->sighand->siglock, flags);
+ audit_log_tty_passwd = current->signal->audit_tty_log_passwd;
+ spin_unlock_irqrestore(¤t->sighand->siglock, flags);
+ if (!audit_log_tty_passwd && icanon && !L_ECHO(tty))
+ return;
+
if (tty->driver->type == TTY_DRIVER_TYPE_PTY
&& tty->driver->subtype == PTY_TYPE_MASTER)
return;
if (tty->driver->type == TTY_DRIVER_TYPE_PTY
&& tty->driver->subtype == PTY_TYPE_MASTER)
return;
@@
-317,16
+324,17
@@
void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
void tty_audit_push(struct tty_struct *tty)
{
struct tty_audit_buf *buf;
void tty_audit_push(struct tty_struct *tty)
{
struct tty_audit_buf *buf;
+ unsigned long flags;
- spin_lock_irq
(¤t->sighand->siglock
);
+ spin_lock_irq
save(¤t->sighand->siglock, flags
);
if (likely(!current->signal->audit_tty)) {
if (likely(!current->signal->audit_tty)) {
- spin_unlock_irq
(¤t->sighand->siglock
);
+ spin_unlock_irq
restore(¤t->sighand->siglock, flags
);
return;
}
buf = current->signal->tty_audit_buf;
if (buf)
atomic_inc(&buf->count);
return;
}
buf = current->signal->tty_audit_buf;
if (buf)
atomic_inc(&buf->count);
- spin_unlock_irq
(¤t->sighand->siglock
);
+ spin_unlock_irq
restore(¤t->sighand->siglock, flags
);
if (buf) {
int major, minor;
if (buf) {
int major, minor;