Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
ab249d46
Commit
ab249d46
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 1.1.7
parent
de0eab26
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
4 deletions
+25
-4
Makefile
Makefile
+1
-1
mm/memory.c
mm/memory.c
+15
-3
net/inet/raw.c
net/inet/raw.c
+3
-0
net/inet/sock.c
net/inet/sock.c
+1
-0
net/inet/udp.c
net/inet/udp.c
+5
-0
No files found.
Makefile
View file @
ab249d46
VERSION
=
1
PATCHLEVEL
=
1
SUBLEVEL
=
6
SUBLEVEL
=
7
all
:
Version zImage
...
...
mm/memory.c
View file @
ab249d46
...
...
@@ -916,11 +916,23 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code)
return
;
}
if
(
address
<
PAGE_SIZE
)
{
printk
(
"Unable to handle kernel NULL pointer dereference"
);
printk
(
KERN_ALERT
"Unable to handle kernel NULL pointer dereference"
);
pg0
[
0
]
=
PAGE_SHARED
;
}
else
printk
(
"Unable to handle kernel paging request"
);
printk
(
" at address %08lx
\n
"
,
address
);
printk
(
KERN_ALERT
"Unable to handle kernel paging request"
);
printk
(
" at kernel address %08lx
\n
"
,
address
);
address
+=
TASK_SIZE
;
__asm__
(
"movl %%cr3,%0"
:
"=r"
(
user_esp
));
printk
(
KERN_ALERT
"current->tss.cr3 = %08lx, %%cr3 = %08lx
\n
"
,
current
->
tss
.
cr3
,
user_esp
);
user_esp
=
((
unsigned
long
*
)
user_esp
)[
address
>>
22
];
printk
(
KERN_ALERT
"*pde = %08lx
\n
"
,
user_esp
);
if
(
user_esp
&
PAGE_PRESENT
)
{
user_esp
&=
PAGE_MASK
;
address
&=
0x003ff000
;
user_esp
=
((
unsigned
long
*
)
user_esp
)[
address
>>
PAGE_SHIFT
];
printk
(
KERN_ALERT
"*pte = %08lx
\n
"
,
user_esp
);
}
die_if_kernel
(
"Oops"
,
regs
,
error_code
);
do_exit
(
SIGKILL
);
}
...
...
net/inet/raw.c
View file @
ab249d46
...
...
@@ -197,6 +197,9 @@ static int raw_sendto(struct sock *sk, unsigned char *from,
if
(
sin
.
sin_port
==
0
)
sin
.
sin_port
=
sk
->
protocol
;
if
(
sin
.
sin_addr
.
s_addr
==
INADDR_ANY
)
sin
.
sin_addr
.
s_addr
=
ip_my_addr
();
if
(
sk
->
broadcast
==
0
&&
ip_chk_addr
(
sin
.
sin_addr
.
s_addr
)
==
IS_BROADCAST
)
return
-
EACCES
;
...
...
net/inet/sock.c
View file @
ab249d46
...
...
@@ -1144,6 +1144,7 @@ inet_accept(struct socket *sock, struct socket *newsock, int flags)
{
struct
sock
*
sk
=
(
struct
sock
*
)
newsock
->
data
;
newsock
->
data
=
NULL
;
sk
->
dead
=
1
;
destroy_sock
(
sk
);
}
...
...
net/inet/udp.c
View file @
ab249d46
...
...
@@ -35,6 +35,7 @@
* Alan Cox : No wakeup calls. Instead we now use the callbacks.
* Alan Cox : Use ip_tos and ip_ttl
* Alan Cox : SNMP Mibs
* Alan Cox : MSG_DONTROUTE, and 0.0.0.0 support.
*
*
* This program is free software; you can redistribute it and/or
...
...
@@ -395,6 +396,10 @@ static int udp_sendto(struct sock *sk, unsigned char *from, int len, int noblock
* BSD socket semantics. You must set SO_BROADCAST to permit
* broadcasting of data.
*/
if
(
sin
.
sin_addr
.
s_addr
==
INADDR_ANY
)
sin
.
sin_addr
.
s_addr
=
ip_my_addr
();
if
(
!
sk
->
broadcast
&&
ip_chk_addr
(
sin
.
sin_addr
.
s_addr
)
==
IS_BROADCAST
)
return
-
EACCES
;
/* Must turn broadcast on first */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment